version:6.8

fix:
update:修改主页健康码为应用,拨号增加系统拨号
This commit is contained in:
2022-12-12 16:43:19 +08:00
parent a25e240287
commit 64ef99ba10
26 changed files with 696 additions and 91 deletions

View File

@@ -1,13 +1,12 @@
<?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:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/dp_300"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_300"
android:background="@drawable/background_add"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -18,7 +17,7 @@
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:text="@string/privacy_agreement_title"
android:textColor="@color/black"
android:textSize="@dimen/sp_17"
@@ -26,36 +25,42 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_content"
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_24"
android:text="@string/privacy_agreement_content"
android:textColor="@color/black"
android:textSize="@dimen/sp_15"
android:layout_marginBottom="@dimen/dp_8"
app:layout_constraintBottom_toTopOf="@+id/linearLayout5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />
app:layout_constraintTop_toBottomOf="@+id/textView6">
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_agreement_content"
android:textColor="@color/black"
android:textSize="@dimen/sp_15" />
</ScrollView>
<LinearLayout
android:id="@+id/linearLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_32"
android:layout_marginBottom="@dimen/dp_16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_content">
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
<TextView
android:id="@+id/tv_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="暂不使用"
android:layout_weight="1"
android:gravity="center"
android:text="暂不使用"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"
@@ -66,9 +71,9 @@
android:id="@+id/tv_confirm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="同意"
android:gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="同意"
android:textColor="@color/notice_blue"
android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent"