tt/Xuewang365OSNeutral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:7.3

Browse Source 
fix:
update:细节调整
This commit is contained in:
Fanhuitong
2022-12-29 11:47:32 +08:00
parent f05d2aa40e
commit 5bd102b891
19 changed files with 136 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/dialer_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/drawable-hdpi/icon_dialer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

15
app/src/main/res/drawable/background_weather_rain.xml
View File

@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid
android:color="#00b7ee" />
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="16dp"
android:topRightRadius="16dp"
android:bottomLeftRadius="16dp"
android:bottomRightRadius="16dp" />
android:bottomRightRadius="16dp"
android:topLeftRadius="16dp"
android:topRightRadius="16dp" />
<padding
android:top="4dp"
android:bottom="4dp"
android:left="4dp"
android:right="4dp"
/>
android:top="4dp" />
</shape>

2
app/src/main/res/drawable/et_bg.xml
View File

@@ -4,5 +4,5 @@
<stroke
android:width="2px"
android:color="@color/lightGray" />
<corners android:radius="@dimen/dp_8" />
<corners android:radius="@dimen/dp_4" />
</shape>

4
app/src/main/res/drawable/join_background.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/default_background_color" />
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="@dimen/dp_4" />
<padding
android:bottom="0dp"

2
app/src/main/res/drawable/joined_background.xml
View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/lightGray" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="@dimen/dp_4" />
<padding
android:bottom="0dp"

2
app/src/main/res/drawable/notice_voice_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/notice_blue" />
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="30dp"

46
app/src/main/res/layout-land/activity_code.xml
View File

@@ -6,6 +6,50 @@
android:layout_height="match_parent"
tools:context=".activity.code.HealthCodeActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="8dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/back_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView5"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/family_space"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_back"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="家庭空间"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
android:layout_marginStart="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView5"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
@@ -13,7 +57,7 @@
app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
<net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/magicIndicator"

2
app/src/main/res/layout-land/activity_contact.xml
View File

@@ -9,7 +9,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_height="@dimen/dp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

46
app/src/main/res/layout-port/activity_code.xml
View File

@@ -6,6 +6,50 @@
android:layout_height="match_parent"
tools:context=".activity.code.HealthCodeActivity">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_marginStart="8dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/back_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/imageView5"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/family_space"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_back"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="家庭空间"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
android:layout_marginStart="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView5"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
@@ -13,7 +57,7 @@
app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
<net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/magicIndicator"

2
app/src/main/res/layout-port/activity_contact.xml
View File

@@ -9,7 +9,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:layout_height="@dimen/dp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

4
app/src/main/res/layout-port/fragment_custom.xml
View File

@@ -424,11 +424,11 @@
android:layout_marginEnd="@dimen/dp_8"
app:cpvDuration="1000"
app:cpvLabelTextColor="@color/white"
app:cpvLabelTextSize="26sp"
app:cpvLabelTextSize="24sp"
app:cpvNormalColor="#c1d4c4"
app:cpvProgressColor="#27602f"
app:cpvShowTick="false"
app:cpvStrokeWidth="@dimen/dp_4"
app:cpvStrokeWidth="@dimen/dp_8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/dialog_privacy_policy.xml
View File

@@ -77,7 +77,7 @@
android:gravity="center"
android:text="同意"
android:textStyle="bold"
android:textColor="@color/notice_blue"
android:textColor="@color/default_blue"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tv_content"

2
app/src/main/res/values/colors.xml
View File

@@ -12,7 +12,7 @@
<color name="lightGray">#FFD3D3D3</color>
<color name="tv_add_color">#4880ff</color>
<color name="yellow">#F8B551</color>
<color name="notice_blue">#0480FF</color>
<color name="default_blue">#0480FF</color>
<color name="ok_button">#4D4B50</color>
<color name="red">#FF0000</color>
<color name="actions_item_pressed">#424144</color>