添加设备

This commit is contained in:
2026-04-30 13:47:26 +08:00
parent 6da478f36d
commit e8cb357446
19 changed files with 700 additions and 64 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 527 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 992 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 B

View File

@@ -5,6 +5,127 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context=".home.AddDeviceActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topBar"
android:layout_width="0dp"
android:layout_height="56dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/ivBack"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:src="@mipmap/back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="添加设备"
android:textColor="@color/black"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/contentLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_white"
android:orientation="vertical"
android:padding="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/topBar">
<TextView
android:id="@+id/tvScanTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="扫描附近设备"
android:textColor="@color/black"
android:textSize="16dp"
android:textStyle="bold" />
<TextView
android:id="@+id/tvScanSubtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="持续自动搜索中..."
android:textColor="@color/gray"
android:textSize="14dp" />
<FrameLayout
android:id="@+id/deviceContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<LinearLayout
android:id="@+id/emptyState"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/ivEmpty"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/add_d" />
<TextView
android:id="@+id/tvEmptyHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="请将手机尽量靠近要添加的设备"
android:textColor="@color/gray"
android:textSize="14dp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvDevices"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal"/>
</FrameLayout>
</LinearLayout>
<android.widget.Button
android:id="@+id/btnScanAdd"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/rounded_blue_bg"
android:text="扫描添加"
android:textColor="@color/white"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/contentLayout" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context=".home.AddFamilyActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topBar"
android:layout_width="match_parent"
android:layout_height="56dp">
<ImageView
android:id="@+id/ivBack"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:src="@drawable/back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择Wi-Fi"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/textinput_white_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_wifi" />
<EditText
android:id="@+id/etWifiName"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_weight="1"
android:background="@null"
android:hint="请输入WiFi名称"
android:textColor="@color/black"
android:textSize="16sp" />
<android.widget.Button
android:id="@+id/btnSelectWifi"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="12dp"
android:background="@drawable/rounded_blue_bg"
android:text="选择Wi-Fi"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="12dp"
android:background="@drawable/textinput_white_bg"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_lock" />
<EditText
android:id="@+id/etWifiPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="@null"
android:hint="请输入WiFi密码"
android:inputType="textPassword"
android:textColor="@color/black"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/maskView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#80000000"
android:visibility="gone" />
<LinearLayout
android:id="@+id/bottomButtonLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical"
android:padding="16dp"
android:visibility="gone">
<android.widget.Button
android:id="@+id/btnConfirm"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@drawable/rounded_blue_bg"
android:text="下一步"
android:textColor="@color/white"
android:textSize="16dp"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>

View File

@@ -77,6 +77,7 @@
</FrameLayout>
<FrameLayout
android:id="@+id/add_family"
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_marginEnd="10dp"
@@ -90,6 +91,7 @@
</FrameLayout>
<FrameLayout
android:id="@+id/add"
android:layout_width="38dp"
android:layout_height="38dp"
android:background="@drawable/bg_home_top_icon_green"

View File

@@ -2,60 +2,49 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:background="@drawable/textinput_white_bg"
android:gravity="center_vertical"
android:gravity="center"
android:orientation="vertical"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:paddingTop="4dp"
android:paddingBottom="16dp">
android:background="@drawable/bg_white"
android:layout_marginBottom="14dp"
android:layout_gravity="center_horizontal"
android:padding="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/ivDeviceIcon"
android:layout_width="54dp"
android:layout_height="54dp"
android:src="@drawable/ic_launcher_background"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_height="80dp"
android:layout_weight="1"
android:scaleType="centerInside"
android:src="@mipmap/ic_launcher_round" />
<ImageView
android:layout_marginEnd="20dp"
android:layout_gravity="center_vertical"
android:id="@+id/ivEnter"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/enter_icon"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/go_up" />
</LinearLayout>
<LinearLayout
<TextView
android:id="@+id/tvDeviceType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_marginTop="4dp"
android:textColor="@color/black"
android:textSize="12dp" />
<TextView
android:id="@+id/tvDeviceName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="16dp"
android:text="智能挂式防御机1"
android:textStyle="bold" />
<TextView
android:id="@+id/tvDeviceName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textColor="@color/black"
android:textSize="12dp" />
<TextView
android:id="@+id/tvDeviceStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textColor="@color/gray"
android:text="正在运行1"
android:textSize="12dp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="8dp">
<ImageView
android:id="@+id/ivDeviceIcon2"
android:layout_width="80dp"
android:layout_height="80dp"
android:scaleType="centerInside"
android:src="@mipmap/ic_launcher_round" />
<TextView
android:id="@+id/tvDeviceName2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textColor="@color/black"
android:textSize="17dp" />
</LinearLayout>

View File

@@ -5,7 +5,7 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/message_bg"
android:background="@color/white"
android:orientation="vertical"
tools:context=".personal.PersonalProfileActivity">
@@ -47,22 +47,20 @@
android:id="@+id/ivAvatar"
android:layout_width="112dp"
android:layout_height="112dp"
android:padding="2dp"
android:src="@mipmap/ic_launcher_round" />
android:src="@mipmap/ic_launcher_round"/>
<RelativeLayout
android:gravity="center"
android:layout_width="33dp"
android:layout_height="33dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/ivAvatar"
android:layout_alignEnd="@id/ivAvatar"
android:layout_marginBottom="5dp"
android:background="@drawable/bg_white"
android:layout_marginEnd="12dp">
android:layout_marginEnd="5dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="33dp"
android:layout_height="33dp"
android:background="@drawable/bg_white"
android:padding="8dp"
android:src="@drawable/phone"/>
</RelativeLayout>
@@ -78,6 +76,7 @@
android:id="@+id/itemNickname"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
@@ -120,6 +119,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
@@ -132,7 +132,7 @@
android:textSize="16dp" />
<LinearLayout
android:layout_width="0dp"
android:layout_width="279dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end|center_vertical"

View File

@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/message_bg"
android:orientation="vertical"
tools:context=".home.SetNameActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topBar"
android:layout_width="match_parent"
android:layout_height="56dp">
<ImageView
android:id="@+id/ivBack"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:src="@drawable/back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置名字"
android:textColor="@color/black"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/tvLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置名字"
android:textColor="@color/black"
android:textSize="16dp" />
<EditText
android:id="@+id/etName"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="12dp"
android:background="@drawable/textinput_white_bg"
android:hint="请输入设备名称"
android:paddingHorizontal="16dp"
android:text="智能防御机A1"
android:textColor="@color/black"
android:textSize="14dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<android.widget.Button
android:id="@+id/btnConfirm"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/rounded_blue_bg"
android:text="完成"
android:textColor="@color/white"
android:textSize="16dp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>