Compare commits

...

4 Commits

Author SHA1 Message Date
98e7d57c7d 启动页修改 2026-06-09 08:45:23 +08:00
3c8ac29398 全局图标优化2 2026-06-08 17:23:25 +08:00
5f945fe6e3 全局图标优化 2026-06-08 17:07:44 +08:00
11ab4e244d 登录注册图标优化 2026-06-08 11:58:40 +08:00
278 changed files with 177 additions and 152 deletions

View File

@@ -22,7 +22,7 @@
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/loge" android:icon="@mipmap/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"

View File

@@ -47,7 +47,7 @@ class AddDeviceAdapter(
override fun onBindViewHolder(holder: ViewHolder, position: Int) { override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val device = devices[position] val device = devices[position]
holder.tvName.text = device.name holder.tvName.text = device.name
holder.ivIcon.setImageResource(R.drawable.img) holder.ivIcon.setImageResource(R.mipmap.img)
// 点击事件 // 点击事件
holder.itemView.setOnClickListener { onItemClick(device) } holder.itemView.setOnClickListener { onItemClick(device) }

View File

@@ -64,7 +64,7 @@ class FamilyAdapter(
binding.tvFamilyName.setTextColor(binding.root.context.getColor(R.color.white)) binding.tvFamilyName.setTextColor(binding.root.context.getColor(R.color.white))
binding.tvFamilyRole.setTextColor(binding.root.context.getColor(R.color.white)) binding.tvFamilyRole.setTextColor(binding.root.context.getColor(R.color.white))
binding.ivCheck.visibility = View.VISIBLE binding.ivCheck.visibility = View.VISIBLE
binding.ivCheck.setImageResource(R.drawable.ic_check_white) binding.ivCheck.setImageResource(R.mipmap.ic_check_white)
} else { } else {
binding.layoutFamilyItem.setBackgroundResource(0) binding.layoutFamilyItem.setBackgroundResource(0)
binding.tvFamilyName.setTextColor(binding.root.context.getColor(R.color.black)) binding.tvFamilyName.setTextColor(binding.root.context.getColor(R.color.black))

View File

@@ -37,10 +37,10 @@ class HomeActivity : BaseActivity() {
binding.tabHome.setOnClickListener { binding.tabHome.setOnClickListener {
switchFragment(homeMenuFragment) switchFragment(homeMenuFragment)
// 切换图标 + 文字颜色 // 切换图标 + 文字颜色
binding.ivHome.setImageResource(R.drawable.home_checked) binding.ivHome.setImageResource(R.mipmap.home_checked)
binding.tvHome.setTextColor(resources.getColor(R.color.ic_selected)) binding.tvHome.setTextColor(resources.getColor(R.color.ic_selected))
binding.ivProfile.setImageResource(R.drawable.profile) binding.ivProfile.setImageResource(R.mipmap.profile)
binding.tvProfile.setTextColor(resources.getColor(R.color.ic_normal)) binding.tvProfile.setTextColor(resources.getColor(R.color.ic_normal))
} }
@@ -48,10 +48,10 @@ class HomeActivity : BaseActivity() {
binding.tabProfile.setOnClickListener { binding.tabProfile.setOnClickListener {
switchFragment(personalFragment) switchFragment(personalFragment)
// 切换图标 + 文字颜色 // 切换图标 + 文字颜色
binding.ivHome.setImageResource(R.drawable.home) binding.ivHome.setImageResource(R.mipmap.home)
binding.tvHome.setTextColor(resources.getColor(R.color.ic_normal)) binding.tvHome.setTextColor(resources.getColor(R.color.ic_normal))
binding.ivProfile.setImageResource(R.drawable.profile_checked) binding.ivProfile.setImageResource(R.mipmap.profile_checked)
binding.tvProfile.setTextColor(resources.getColor(R.color.ic_selected)) binding.tvProfile.setTextColor(resources.getColor(R.color.ic_selected))
} }
} }

View File

@@ -49,7 +49,7 @@ class PersonalFragment : Fragment() {
.titleBar(binding.headerLayout) .titleBar(binding.headerLayout)
.init() .init()
Glide.with(this) Glide.with(this)
.load(R.drawable.img) .load(R.mipmap.img)
.circleCrop() .circleCrop()
.into(binding.ivAvatar) .into(binding.ivAvatar)
binding.headerLayout.setOnClickListener { binding.headerLayout.setOnClickListener {
@@ -243,8 +243,8 @@ class PersonalFragment : Fragment() {
} }
userInfo.avatar?.let { userInfo.avatar?.let {
val requestOptions = RequestOptions() val requestOptions = RequestOptions()
.placeholder(R.drawable.img) // 加载中显示 .placeholder(R.mipmap.img) // 加载中显示
.error(R.drawable.img) // 失败时显示 .error(R.mipmap.img) // 失败时显示
Glide.with(this) Glide.with(this)
.load(it) // 如果 avatar 为 nullGlide 会直接回调 error .load(it) // 如果 avatar 为 nullGlide 会直接回调 error

View File

@@ -77,8 +77,8 @@ class AlarmLogActivity : AppCompatActivity() {
.setLockLand(false) .setLockLand(false)
.setShowFullAnimation(true) .setShowFullAnimation(true)
.setNeedShowWifiTip(false) .setNeedShowWifiTip(false)
.setEnlargeImageRes(R.drawable.full_size) .setEnlargeImageRes(R.mipmap.full_size)
.setShrinkImageRes(R.drawable.full_screen) .setShrinkImageRes(R.mipmap.full_screen)
.setBottomShowProgressBarDrawable(progressDrawable, thumbDrawable) .setBottomShowProgressBarDrawable(progressDrawable, thumbDrawable)
.setVideoAllCallBack(object : GSYSampleCallBack() { .setVideoAllCallBack(object : GSYSampleCallBack() {
override fun onPrepared(url: String?, vararg objects: Any?) { override fun onPrepared(url: String?, vararg objects: Any?) {
@@ -230,12 +230,12 @@ class AlarmLogActivity : AppCompatActivity() {
if (isMute) { if (isMute) {
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 0, 0) audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, 0, 0)
binding.ivMute.setImageResource( binding.ivMute.setImageResource(
R.drawable.mute R.mipmap.mute
) )
} else { } else {
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) / 2, 0) audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) / 2, 0)
binding.ivMute.setImageResource( binding.ivMute.setImageResource(
R.drawable.un_mute R.mipmap.un_mute
) )
} }
} }

View File

@@ -8,6 +8,7 @@ import android.util.Log
import android.view.View import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import com.example.defenseapplication.R import com.example.defenseapplication.R
import com.example.defenseapplication.adapter.AlarmLogHorizontalAdapter import com.example.defenseapplication.adapter.AlarmLogHorizontalAdapter
import com.example.defenseapplication.base.BaseActivity import com.example.defenseapplication.base.BaseActivity
@@ -27,6 +28,7 @@ class LiveVideoActivity : BaseActivity() {
private var isVoiceEnabled = false private var isVoiceEnabled = false
private var isLightOn = false private var isLightOn = false
private var isConsoleVisible = false
private var deviceId: String? = null private var deviceId: String? = null
private var alarmList: MutableList<DeviceAlarmBean> = mutableListOf() private var alarmList: MutableList<DeviceAlarmBean> = mutableListOf()
private var alarmAdapter: AlarmLogHorizontalAdapter? = null private var alarmAdapter: AlarmLogHorizontalAdapter? = null
@@ -198,9 +200,9 @@ class LiveVideoActivity : BaseActivity() {
isLightOn = !isLightOn isLightOn = !isLightOn
if (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 { } else {
binding.ivLight.setImageResource(com.example.defenseapplication.R.drawable.light_on) binding.ivLight.setImageResource(com.example.defenseapplication.R.mipmap.light_on)
} }
} }
@@ -210,6 +212,31 @@ class LiveVideoActivity : BaseActivity() {
intent.putExtra("from_live_video", true) intent.putExtra("from_live_video", true)
startActivity(intent) startActivity(intent)
} }
binding.llRecord.setOnClickListener {
isConsoleVisible = !isConsoleVisible
if (isConsoleVisible) {
binding.llAlarmLog.visibility = View.GONE
binding.consoleBar.visibility = View.VISIBLE
binding.ivRecord.setImageResource(R.mipmap.copy_open)
} else {
binding.llAlarmLog.visibility = View.VISIBLE
binding.consoleBar.visibility = View.GONE
binding.ivRecord.setImageResource(R.mipmap.copy)
}
}
binding.llVoice.setOnClickListener {
isVoiceEnabled = !isVoiceEnabled
if (isVoiceEnabled) {
Glide.with(this)
.asGif()
.load(R.mipmap.voice_open)
.into(binding.ivVoice)
} else {
binding.ivVoice.setImageResource(R.mipmap.voice)
}
}
} }
private fun fetchAlarmList(page: Int = 1) { private fun fetchAlarmList(page: Int = 1) {

View File

@@ -232,7 +232,7 @@ class InvitationCodeActivity : AppCompatActivity() {
} }
} }
val logoDrawable = ContextCompat.getDrawable(this, R.mipmap.loge) val logoDrawable = ContextCompat.getDrawable(this, R.mipmap.logo)
if (logoDrawable != null) { if (logoDrawable != null) {
val logoSize = width / 5 val logoSize = width / 5
val logoX = (width - logoSize) / 2 val logoX = (width - logoSize) / 2

View File

@@ -47,9 +47,9 @@ object ToastUtils {
// 设置图标和文字 // 设置图标和文字
if (isSuccess) { if (isSuccess) {
ivIcon.setImageResource(R.drawable.fill) // 成功图标 ivIcon.setImageResource(R.mipmap.fill) // 成功图标
} else { } else {
ivIcon.setImageResource(R.drawable.error_circle) // 失败图标 ivIcon.setImageResource(R.mipmap.error_circle) // 失败图标
} }
tvMessage.text = message tvMessage.text = message

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android" <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false"> android:oneshot="false">
<item android:drawable="@drawable/device1" android:duration="200" /> <item android:drawable="@mipmap/device1" android:duration="200" />
<item android:drawable="@drawable/device2" android:duration="200" /> <item android:drawable="@mipmap/device2" android:duration="200" />
<item android:drawable="@drawable/device3" android:duration="200" /> <item android:drawable="@mipmap/device3" android:duration="200" />
</animation-list> </animation-list>

View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android" <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false"> android:oneshot="false">
<item android:drawable="@drawable/img_add_dev_aini_1" android:duration="200"/> <item android:drawable="@mipmap/device1" android:duration="200"/>
<item android:drawable="@drawable/img_add_dev_aini_2" android:duration="200"/> <item android:drawable="@mipmap/device2" android:duration="200"/>
<item android:drawable="@drawable/img_add_dev_aini_3" android:duration="200"/> <item android:drawable="@mipmap/device3" android:duration="200"/>
<item android:drawable="@drawable/img_add_dev_aini_2" android:duration="500"/> <item android:drawable="@mipmap/device2" android:duration="500"/>
<item android:drawable="@drawable/img_connect_anim_phone1" android:duration="200"/> <item android:drawable="@mipmap/img_connect_anim_phone1" android:duration="200"/>
<item android:drawable="@drawable/img_connect_anim_phone2" android:duration="200"/> <item android:drawable="@mipmap/img_connect_anim_phone2" android:duration="200"/>
<item android:drawable="@drawable/img_connect_anim_phone3" android:duration="200"/> <item android:drawable="@mipmap/img_connect_anim_phone3" android:duration="200"/>
<item android:drawable="@drawable/img_connect_anim_phone1" android:duration="500"/> <item android:drawable="@mipmap/img_connect_anim_phone1" android:duration="500"/>
<item android:drawable="@drawable/img_connect_anim_wifi1" android:duration="200"/> <item android:drawable="@mipmap/img_connect_anim_wifi1" android:duration="200"/>
<item android:drawable="@drawable/img_connect_anim_wifi2" android:duration="200"/> <item android:drawable="@mipmap/img_connect_anim_wifi2" android:duration="200"/>
<item android:drawable="@drawable/img_connect_anim_wifi3" android:duration="200"/> <item android:drawable="@mipmap/img_connect_anim_wifi3" android:duration="200"/>
<item android:drawable="@drawable/img_connect_anim_wifi1" android:duration="500"/> <item android:drawable="@mipmap/img_connect_anim_wifi1" android:duration="500"/>
</animation-list> </animation-list>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/check_ellipse"/> <item android:state_checked="true" android:drawable="@mipmap/check_ellipse"/>
<item android:drawable="@drawable/ellipse"/> <item android:drawable="@mipmap/ellipse"/>
</selector> </selector>

View File

@@ -12,7 +12,7 @@
android:id="@+id/logoFrame" android:id="@+id/logoFrame"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:src="@mipmap/loge" android:src="@mipmap/logo"
android:contentDescription="Logo" android:contentDescription="Logo"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -5,15 +5,15 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@mipmap/huaban"
tools:context=".home.StartActivity"> tools:context=".home.StartActivity">
<!-- Logo 图片:横竖屏均居中 --> <!-- Logo 图片:横竖屏均居中 -->
<ImageView <ImageView
android:id="@+id/logoFrame" android:id="@+id/logoFrame"
android:layout_width="160dp" android:layout_width="264dp"
android:layout_height="120dp" android:layout_height="62dp"
android:src="@mipmap/loge1" android:src="@mipmap/logo2"
android:padding="5dp" android:padding="5dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

View File

@@ -89,8 +89,7 @@
<ImageView <ImageView
android:id="@+id/ivScanAnimation" android:id="@+id/ivScanAnimation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="260dp" android:layout_height="260dp"/>
android:src="@drawable/add_d" />
<TextView <TextView
android:id="@+id/tvEmptyHint" android:id="@+id/tvEmptyHint"

View File

@@ -23,7 +23,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:src="@drawable/back" android:src="@mipmap/back"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -59,7 +59,7 @@
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_wifi" /> android:src="@mipmap/ic_wifi" />
<EditText <EditText
android:id="@+id/etWifiName" android:id="@+id/etWifiName"
@@ -95,7 +95,7 @@
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_lock" /> android:src="@mipmap/ic_lock" />
<EditText <EditText
android:id="@+id/etWifiPassword" android:id="@+id/etWifiPassword"

View File

@@ -22,7 +22,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -55,7 +55,7 @@
<ImageView <ImageView
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:src="@drawable/search" android:src="@mipmap/search"
android:layout_marginRight="8dp"/> android:layout_marginRight="8dp"/>
<EditText <EditText

View File

@@ -32,14 +32,14 @@
android:id="@+id/ivDownload" android:id="@+id/ivDownload"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/download"/> android:src="@mipmap/download"/>
<ImageView <ImageView
android:id="@+id/ivDelete" android:id="@+id/ivDelete"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:src="@drawable/delete"/> android:src="@mipmap/delete"/>
</LinearLayout> </LinearLayout>
<!-- 右下侧按钮层 --> <!-- 右下侧按钮层 -->
@@ -55,7 +55,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginBottom="60dp" android:layout_marginBottom="60dp"
android:src="@drawable/un_mute"/> android:src="@mipmap/un_mute"/>
</LinearLayout> </LinearLayout>
@@ -88,7 +88,7 @@
<ImageView <ImageView
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/expand" /> android:src="@mipmap/expand" />
</LinearLayout> </LinearLayout>

View File

@@ -19,7 +19,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -139,7 +139,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -183,7 +183,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -23,7 +23,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View File

@@ -20,7 +20,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -84,7 +84,7 @@
android:id="@+id/successImage" android:id="@+id/successImage"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="110dp" android:layout_height="110dp"
android:src="@drawable/connected_successfully" /> android:src="@mipmap/success" />
<TextView <TextView
android:layout_marginTop="20dp" android:layout_marginTop="20dp"

View File

@@ -20,7 +20,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View File

@@ -36,7 +36,7 @@
<ImageView <ImageView
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:src="@drawable/chinexe" android:src="@mipmap/chinese"
android:scaleType="centerInside" /> android:scaleType="centerInside" />
<TextView <TextView
@@ -69,7 +69,7 @@
<ImageView <ImageView
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:src="@drawable/english" android:src="@mipmap/english"
android:scaleType="centerInside" /> android:scaleType="centerInside" />
<TextView <TextView

View File

@@ -70,7 +70,7 @@
android:id="@+id/safeIcon" android:id="@+id/safeIcon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/safe" android:src="@mipmap/safe"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintBottom_toBottomOf="parent" />
@@ -96,7 +96,7 @@
android:id="@+id/cardFaceIcon" android:id="@+id/cardFaceIcon"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
android:src="@drawable/face_verification" android:src="@mipmap/face_verification"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/topSubContainer" /> app:layout_constraintTop_toBottomOf="@id/topSubContainer" />
@@ -138,7 +138,7 @@
<ImageView <ImageView
android:layout_width="59dp" android:layout_width="59dp"
android:layout_height="59dp" android:layout_height="59dp"
android:src="@drawable/mask_group"/> android:src="@mipmap/mask_group"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -149,7 +149,7 @@
<ImageView <ImageView
android:layout_width="15dp" android:layout_width="15dp"
android:layout_height="15dp" android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram2"/> android:src="@mipmap/common_icons_miniprogram2"/>
<TextView <TextView
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -175,7 +175,7 @@
<ImageView <ImageView
android:layout_width="59dp" android:layout_width="59dp"
android:layout_height="59dp" android:layout_height="59dp"
android:src="@drawable/standard_capture"/> android:src="@mipmap/standard_capture"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -186,7 +186,7 @@
<ImageView <ImageView
android:layout_width="15dp" android:layout_width="15dp"
android:layout_height="15dp" android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram1"/> android:src="@mipmap/common_icons_miniprogram1"/>
<TextView <TextView
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -212,7 +212,7 @@
<ImageView <ImageView
android:layout_width="59dp" android:layout_width="59dp"
android:layout_height="59dp" android:layout_height="59dp"
android:src="@drawable/cropped_shot"/> android:src="@mipmap/cropped_shot"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -223,7 +223,7 @@
<ImageView <ImageView
android:layout_width="15dp" android:layout_width="15dp"
android:layout_height="15dp" android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram1"/> android:src="@mipmap/common_icons_miniprogram1"/>
<TextView <TextView
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -249,7 +249,7 @@
<ImageView <ImageView
android:layout_width="59dp" android:layout_width="59dp"
android:layout_height="59dp" android:layout_height="59dp"
android:src="@drawable/low_light"/> android:src="@mipmap/low_light"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -260,7 +260,7 @@
<ImageView <ImageView
android:layout_width="15dp" android:layout_width="15dp"
android:layout_height="15dp" android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram1"/> android:src="@mipmap/common_icons_miniprogram1"/>
<TextView <TextView
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"

View File

@@ -23,7 +23,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -54,7 +54,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>

View File

@@ -37,7 +37,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/back" android:src="@mipmap/back"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -69,8 +69,8 @@
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">
<ImageView <ImageView
android:layout_width="12dp" android:layout_width="wrap_content"
android:layout_height="12dp" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_red_dot" /> android:src="@drawable/ic_red_dot" />

View File

@@ -39,7 +39,7 @@
android:id="@+id/iv_home" android:id="@+id/iv_home"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/home_checked"/> android:src="@mipmap/home_checked"/>
<TextView <TextView
android:id="@+id/tv_home" android:id="@+id/tv_home"
@@ -64,7 +64,7 @@
android:id="@+id/iv_profile" android:id="@+id/iv_profile"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/profile"/> android:src="@mipmap/profile"/>
<TextView <TextView
android:id="@+id/tv_profile" android:id="@+id/tv_profile"

View File

@@ -51,7 +51,7 @@
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="6dp" android:layout_height="6dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:src="@drawable/triangle" /> android:src="@mipmap/triangle" />
</LinearLayout> </LinearLayout>
<TextView <TextView
@@ -76,7 +76,7 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/message"/> android:src="@mipmap/message"/>
<TextView <TextView
android:id="@+id/tvUnreadCount" android:id="@+id/tvUnreadCount"
@@ -103,7 +103,7 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/scan_icon"/> android:src="@mipmap/scan_icon"/>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
@@ -116,7 +116,7 @@
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/add"/> android:src="@mipmap/add"/>
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -165,7 +165,7 @@
<ImageView <ImageView
android:layout_width="244dp" android:layout_width="244dp"
android:layout_height="131dp" android:layout_height="131dp"
android:src="@drawable/default_page" /> android:src="@mipmap/default_page" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -22,7 +22,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -65,7 +65,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<!-- 二维码卡片 --> <!-- 二维码卡片 -->
@@ -114,7 +114,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@mipmap/loge" /> android:src="@mipmap/logo" />
</FrameLayout> </FrameLayout>
<!-- 使用智能文字和图标 --> <!-- 使用智能文字和图标 -->
<LinearLayout <LinearLayout
@@ -190,7 +190,7 @@
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<!-- 底部按钮区域 --> <!-- 底部按钮区域 -->

View File

@@ -23,9 +23,9 @@
<ImageView <ImageView
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="24dp"
android:layout_height="wrap_content" android:layout_height="24dp"
android:src="@drawable/go_up" /> android:src="@mipmap/go_up" />
</LinearLayout> </LinearLayout>
<TextView <TextView

View File

@@ -65,8 +65,7 @@
android:id="@+id/ivDetail" android:id="@+id/ivDetail"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:padding="5dp" android:src="@mipmap/right_back"
android:src="@drawable/right_back"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

View File

@@ -18,6 +18,6 @@
android:id="@+id/ivWifiIcon" android:id="@+id/ivWifiIcon"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:src="@drawable/ic_wifi"/> android:src="@mipmap/ic_wifi"/>
</LinearLayout> </LinearLayout>

View File

@@ -22,7 +22,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -55,7 +55,7 @@
<ImageView <ImageView
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:src="@drawable/search" android:src="@mipmap/search"
android:layout_marginRight="8dp"/> android:layout_marginRight="8dp"/>
<EditText <EditText

View File

@@ -23,7 +23,7 @@
android:id="@+id/btnBack" android:id="@+id/btnBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="@drawable/back"/> android:background="@mipmap/back"/>
<TextView <TextView
android:id="@+id/tvTitle" android:id="@+id/tvTitle"
@@ -39,7 +39,7 @@
android:id="@+id/ivMenu" android:id="@+id/ivMenu"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/settings" /> android:src="@mipmap/settings" />
</LinearLayout> </LinearLayout>
@@ -71,7 +71,7 @@
android:id="@+id/ivVoice" android:id="@+id/ivVoice"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/voice" /> android:src="@mipmap/voice" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -95,7 +95,7 @@
android:id="@+id/ivLight" android:id="@+id/ivLight"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/light_on" /> android:src="@mipmap/light_on" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -119,7 +119,7 @@
android:id="@+id/ivRecord" android:id="@+id/ivRecord"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/copy"/> android:src="@mipmap/copy"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -240,7 +240,7 @@
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/right_back"/> android:src="@mipmap/right_back"/>
</LinearLayout> </LinearLayout>

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -49,7 +49,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -69,7 +69,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>

View File

@@ -58,7 +58,7 @@
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/no_message" /> android:src="@mipmap/no_message" />
</LinearLayout> </LinearLayout>
<TextView <TextView

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -76,7 +76,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -52,7 +52,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
@@ -75,7 +75,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>

View File

@@ -83,7 +83,7 @@
<ImageView <ImageView
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/switch_family" /> android:src="@mipmap/switch_family" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -107,7 +107,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -122,7 +122,7 @@
<ImageView <ImageView
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/user_manage" /> android:src="@mipmap/user_manage" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -136,7 +136,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -151,7 +151,7 @@
<ImageView <ImageView
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/pwd_manager" /> android:src="@mipmap/pwd_manager" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -165,7 +165,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -180,7 +180,7 @@
<ImageView <ImageView
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/face_manage" /> android:src="@mipmap/face_manage" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -194,7 +194,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/itemLanguage" android:id="@+id/itemLanguage"
@@ -207,7 +207,7 @@
<ImageView <ImageView
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:src="@drawable/voice_translation" /> android:src="@mipmap/voice_translation" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -230,7 +230,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<Space <Space

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -58,7 +58,7 @@
android:layout_height="33dp" android:layout_height="33dp"
android:background="@drawable/bg_white" android:background="@drawable/bg_white"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/phone"/> android:src="@mipmap/phone"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
@@ -106,7 +106,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -149,7 +149,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -62,7 +62,7 @@ tools:context=".login.RegisterSuccessActivity">
android:id="@+id/cardFaceIcon" android:id="@+id/cardFaceIcon"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="110dp" android:layout_height="110dp"
android:src="@drawable/success" android:src="@mipmap/success"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRegisterSubtitle" /> app:layout_constraintTop_toBottomOf="@id/tvRegisterSubtitle" />

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View File

@@ -19,7 +19,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:src="@drawable/back" android:src="@mipmap/back"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

View File

@@ -18,7 +18,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -69,7 +69,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<View <View
@@ -98,7 +98,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<View <View
@@ -142,7 +142,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -187,7 +187,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -240,7 +240,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -270,7 +270,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<View <View
@@ -313,7 +313,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -358,7 +358,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -388,7 +388,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<View <View

View File

@@ -20,7 +20,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -55,7 +55,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/human_body" /> android:src="@mipmap/human_body" />
<!-- 打击标记图标(跟随选中的区域移动,坐标相对于父容器中心) --> <!-- 打击标记图标(跟随选中的区域移动,坐标相对于父容器中心) -->
<ImageView <ImageView
@@ -64,7 +64,7 @@
android:layout_height="100dp" android:layout_height="100dp"
android:layout_gravity="center" android:layout_gravity="center"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/dajitubiao" /> android:src="@mipmap/dajitubiao" />
</FrameLayout> </FrameLayout>

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View File

@@ -21,7 +21,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -75,7 +75,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:src="@drawable/right_back"/> android:src="@mipmap/right_back"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

View File

@@ -20,7 +20,7 @@
android:id="@+id/btnBack" android:id="@+id/btnBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"

View File

@@ -18,7 +18,7 @@
android:id="@+id/ivBack" android:id="@+id/ivBack"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/back" /> android:src="@mipmap/back" />
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
@@ -75,7 +75,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -120,7 +120,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -165,7 +165,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -195,7 +195,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:src="@drawable/right_back" /> android:src="@mipmap/right_back" />
</LinearLayout> </LinearLayout>
<View <View

View File

@@ -23,7 +23,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:src="@drawable/back" android:src="@mipmap/back"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -59,7 +59,7 @@
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_wifi" /> android:src="@mipmap/ic_wifi" />
<EditText <EditText
android:id="@+id/etWifiName" android:id="@+id/etWifiName"
@@ -95,7 +95,7 @@
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/ic_lock" /> android:src="@mipmap/ic_lock" />
<EditText <EditText
android:id="@+id/etWifiPassword" android:id="@+id/etWifiPassword"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 527 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 848 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 855 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 429 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 572 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 992 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 735 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Some files were not shown because too many files have changed in this diff Show More