diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5ed700b..9ac6a21 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.DefenseApplication"> + diff --git a/app/src/main/java/com/example/defenseapplication/home/AddDeviceActivity.kt b/app/src/main/java/com/example/defenseapplication/home/AddDeviceActivity.kt new file mode 100644 index 0000000..7d07526 --- /dev/null +++ b/app/src/main/java/com/example/defenseapplication/home/AddDeviceActivity.kt @@ -0,0 +1,21 @@ +package com.example.defenseapplication.home + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import com.example.defenseapplication.R + +class AddDeviceActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.add_device_activity) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file 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 76511e9..ffc5437 100644 --- a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt +++ b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt @@ -23,7 +23,7 @@ class PersonalFragment : Fragment() { ): View { _binding = PersonalFragmentBinding.inflate(inflater, container, false) Glide.with(this) - .load(R.mipmap.ic_launcher_round) + .load(R.drawable.img) .circleCrop() .into(binding.ivAvatar) binding.headerLayout.setOnClickListener { diff --git a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt b/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt index 9665030..be35d93 100644 --- a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt +++ b/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt @@ -30,9 +30,8 @@ class PersonalProfileActivity : AppCompatActivity() { private fun initView() { binding.ivBack.setOnClickListener { finish() } - // 默认展示数据(后续可接你的用户信息接口/数据库) Glide.with(this) - .load(R.mipmap.ic_launcher_round) + .load(R.drawable.img) .circleCrop() .into(binding.ivAvatar) diff --git a/app/src/main/res/drawable/add_d.png b/app/src/main/res/drawable/add_d.png new file mode 100644 index 0000000..49d40c0 Binary files /dev/null and b/app/src/main/res/drawable/add_d.png differ diff --git a/app/src/main/res/drawable/img.png b/app/src/main/res/drawable/img.png new file mode 100644 index 0000000..070f5eb Binary files /dev/null and b/app/src/main/res/drawable/img.png differ diff --git a/app/src/main/res/layout/add_device_activity.xml b/app/src/main/res/layout/add_device_activity.xml new file mode 100644 index 0000000..8ff8b1c --- /dev/null +++ b/app/src/main/res/layout/add_device_activity.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_message_notice.xml b/app/src/main/res/layout/item_message_notice.xml index 5246727..fc529d4 100644 --- a/app/src/main/res/layout/item_message_notice.xml +++ b/app/src/main/res/layout/item_message_notice.xml @@ -65,7 +65,6 @@ android:id="@+id/ivDetail" android:layout_width="24dp" android:layout_height="24dp" - android:background="@drawable/bg_detail_border" android:padding="5dp" android:src="@drawable/right_back" app:layout_constraintBottom_toBottomOf="parent"