Update Android app login, home, and face verification flows.

Sync current local UI and activity changes to remote repository.

Made-with: Cursor
This commit is contained in:
2026-04-27 15:39:47 +08:00
parent 2e6aba459c
commit b47704b281
24 changed files with 876 additions and 204 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/green"/>
<corners android:radius="16dp"/>
<solid android:color="@color/face"/>
<corners android:radius="28dp"/>
</shape>

View File

@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="智能防御机"
android:textSize="28sp"
android:textSize="26dp"
android:textStyle="bold"
android:textColor="@color/black"
app:layout_constraintTop_toBottomOf="@id/logoFrame"
@@ -86,8 +86,8 @@
android:paddingEnd="16dp">
<ImageView
android:id="@+id/ivPhoneIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/lg"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -129,8 +129,8 @@
<!-- 左侧图标 -->
<ImageView
android:id="@+id/ivSmsIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/vc"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -188,8 +188,8 @@
<!-- 左侧图标 -->
<ImageView
android:id="@+id/ivPasswordIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/ma"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

View File

@@ -2,9 +2,293 @@
<androidx.constraintlayout.widget.ConstraintLayout 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:background="@color/login_background"
android:id="@+id/main"
android:padding="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".login.FaceLoginActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:paddingStart="16dp"
android:paddingEnd="16dp">
<ImageView
android:id="@+id/backIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 标题:注册 -->
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="人脸识别"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/backIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/backIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- 副标题:注册用户 -->
<TextView
android:id="@+id/tvRegisterSubtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="人脸验证"
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/topContainer" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topSubContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRegisterSubtitle"
android:paddingStart="16dp"
android:paddingEnd="16dp">
<ImageView
android:id="@+id/safeIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/safe"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 标题:注册 -->
<TextView
android:id="@+id/tvSubTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="仅用于创建防御机制和防窃取,保障您的安全"
android:textColor="@color/green"
android:textSize="12sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/safeIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/safeIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- 人脸图标占位符(模拟人脸识别形象) -->
<ImageView
android:paddingTop="50dp"
android:id="@+id/cardFaceIcon"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/face_verification"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/topSubContainer" />
<!-- 提示信息 -->
<TextView
android:id="@+id/tvInstruction"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="11dp"
android:text="请根据指示完成人脸验证"
android:textColor="@color/icon_face"
android:textSize="12dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cardFaceIcon" />
<LinearLayout
android:orientation="horizontal"
android:id="@+id/cbLowLight"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvInstruction"
android:paddingStart="16dp"
android:paddingTop="48dp"
android:paddingEnd="16dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<LinearLayout
android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="59dp"
android:layout_height="59dp"
android:src="@drawable/mask_group"/>
</LinearLayout>
<LinearLayout
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram2"/>
<TextView
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="标准拍摄"
android:textColor="@color/icon_face"
android:textSize="12dp"
android:textStyle="bold"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<LinearLayout
android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="59dp"
android:layout_height="59dp"
android:src="@drawable/standard_capture"/>
</LinearLayout>
<LinearLayout
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram1"/>
<TextView
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="标准拍摄"
android:textColor="@color/icon_face"
android:textSize="12dp"
android:textStyle="bold"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<LinearLayout
android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="59dp"
android:layout_height="59dp"
android:src="@drawable/cropped_shot"/>
</LinearLayout>
<LinearLayout
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram1"/>
<TextView
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="拍摄不全"
android:textColor="@color/icon_face"
android:textSize="12dp"
android:textStyle="bold"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<LinearLayout
android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="59dp"
android:layout_height="59dp"
android:src="@drawable/low_light"/>
</LinearLayout>
<LinearLayout
android:layout_marginTop="10dp"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:src="@drawable/common_icons_miniprogram1"/>
<TextView
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="光线不足"
android:textColor="@color/icon_face"
android:textSize="12dp"
android:textStyle="bold"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- 开始验证按钮 -->
<android.widget.Button
android:id="@+id/btnStartVerification"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:text="开始验证"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"
android:background="@drawable/rounded_blue_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cbLowLight" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -7,4 +7,14 @@
android:layout_height="match_parent"
tools:context=".login.FaceVerificationActivity">
<androidx.camera.view.PreviewView
android:id="@+id/previewView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.example.defenseapplication.view.FaceOverlayView
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -20,8 +20,8 @@
android:paddingEnd="16dp">
<ImageView
android:id="@+id/backIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -71,8 +71,8 @@
<ImageView
android:id="@+id/ivPhoneIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/lg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -115,8 +115,8 @@
<!-- 左侧图标 -->
<ImageView
android:id="@+id/ivSmsIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/vc"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -173,8 +173,8 @@
<!-- 左侧图标 -->
<ImageView
android:id="@+id/ivPasswordIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
@@ -214,8 +214,8 @@
<ImageView
android:id="@+id/ivInviteIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@@ -7,4 +7,73 @@
android:layout_height="match_parent"
tools:context=".home.HomeActivity">
<!-- Fragment 容器 -->
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/bottom_layout"
app:layout_constraintTop_toTopOf="parent"/>
<!-- 自定义底部导航LinearLayout-->
<LinearLayout
android:id="@+id/bottom_layout"
android:layout_width="match_parent"
android:layout_height="70dp"
android:background="#F9F9F9"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
<!-- 首页 -->
<LinearLayout
android:id="@+id/tab_home"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:clickable="true">
<ImageView
android:id="@+id/iv_home"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/home_checked"/>
<TextView
android:id="@+id/tv_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="首页"
android:textSize="12sp"
android:textColor="@color/black"/>
</LinearLayout>
<!-- 个人 -->
<LinearLayout
android:id="@+id/tab_profile"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:clickable="true">
<ImageView
android:id="@+id/iv_profile"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/profile"/>
<TextView
android:id="@+id/tv_profile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="个人"
android:textSize="12sp"
android:textColor="@color/gray"/>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".home.HomeMenuFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="首页 Fragment"
android:textSize="20sp"/>
</LinearLayout>

View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".home.PersonalFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="个人 Fragment"
android:textSize="20sp"/>
</FrameLayout>
</LinearLayout>

View File

@@ -20,8 +20,8 @@
android:paddingEnd="16dp">
<ImageView
android:id="@+id/backIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -33,12 +33,13 @@
android:layout_height="wrap_content"
android:text="注册"
android:textColor="@color/black"
android:textSize="32sp"
android:textSize="16dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/backIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/backIcon" />
app:layout_constraintTop_toTopOf="@id/backIcon"
app:layout_constraintVertical_bias="0.518" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -49,7 +50,7 @@
android:layout_height="wrap_content"
android:text="注册用户"
android:textColor="@color/black"
android:textSize="20dp"
android:textSize="24dp"
android:textStyle="bold"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
@@ -71,8 +72,8 @@
<ImageView
android:id="@+id/ivPhoneIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/lg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -113,8 +114,8 @@
<ImageView
android:id="@+id/ivIdIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/id_card"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -156,8 +157,8 @@
<!-- 左侧图标 -->
<ImageView
android:id="@+id/ivPasswordIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/ma"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -198,8 +199,8 @@
<ImageView
android:id="@+id/ivInviteIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/ic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

View File

@@ -1,10 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
tools:context=".login.RegisterSuccessActivity">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/login_background"
android:id="@+id/main"
android:padding="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".login.RegisterSuccessActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:paddingStart="16dp"
android:paddingEnd="16dp">
<ImageView
android:id="@+id/backIcon"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@mipmap/back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 标题:注册 -->
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="注册"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/backIcon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/backIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- 副标题:注册用户 -->
<TextView
android:id="@+id/tvRegisterSubtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="注册用户"
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/topContainer" />
<!--图标 -->
<ImageView
android:layout_marginTop="175dp"
android:id="@+id/cardFaceIcon"
android:layout_width="110dp"
android:layout_height="110dp"
android:src="@drawable/success"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRegisterSubtitle" />
<!-- 进入平台3S -->
<android.widget.Button
android:id="@+id/btnEnter"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginTop="140dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="25dp"
android:layout_marginEnd="25dp"
android:text="进入平台3S"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"
android:background="@drawable/rounded_blue_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardFaceIcon" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -6,5 +6,9 @@
<color name="gray">#999999</color>
<color name="login_background">#EDF4FF</color>
<color name="red">#E34D59</color>
<color name="icon_face">#666666</color>
<color name="face">#F0F0F0</color>
<color name="ic_selected">#000000 </color>
<color name="ic_normal">#999999 </color>
</resources>

View File

@@ -1,3 +1,5 @@
<resources>
<string name="app_name">DefenseApplication</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>