version:1.7

fix:
update:修改布局,爱心守护播放视频,
This commit is contained in:
2022-02-25 17:23:59 +08:00
parent 47b5f12c6c
commit f74e6b106c
64 changed files with 1494 additions and 422 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/actions_item_bg_s" android:state_focused="true" />
<item android:drawable="@drawable/actions_item_bg_s" android:state_pressed="true" />
<item android:drawable="@color/actions_item_pressed" android:state_pressed="true" />
<item>
<shape>
<solid android:color="@color/colorPrimary" />

View File

@@ -45,7 +45,7 @@
android:layout_marginTop="8dp"
android:text="天气预报"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -93,7 +93,7 @@
android:layout_marginTop="8dp"
android:text="爱心守护"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -136,15 +136,15 @@
android:layout_marginTop="8dp"
android:text="紧急呼叫"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_sos"
android:layout_width="64dp"
android:layout_height="80dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/sos_icon"
@@ -188,7 +188,7 @@
android:layout_marginTop="8dp"
android:text="我的闹钟"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -233,7 +233,7 @@
android:layout_marginTop="8dp"
android:text="设备状态"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -253,12 +253,12 @@
<ImageView
android:id="@+id/iv_charging"
android:layout_width="40dp"
android:layout_height="22dp"
android:layout_width="32dp"
android:layout_height="23dp"
android:layout_marginStart="32dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/charging"
android:scaleType="centerInside"
android:src="@drawable/charging_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -287,9 +287,11 @@
<ImageView
android:id="@+id/iv_wifi"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="32dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/wifi_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -329,7 +331,6 @@
app:cpvStrokeWidth="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.481"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -341,7 +342,7 @@
android:layout_marginTop="8dp"
android:text="一键加速"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -362,15 +363,15 @@
android:layout_marginTop="8dp"
android:text="系统应用"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_allapp"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/systemapp_icon"

View File

@@ -8,9 +8,11 @@
<ImageView
android:id="@+id/iv_icon"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="center_horizontal"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:srcCompat="@mipmap/ic_launcher" />
<TextView
@@ -20,7 +22,7 @@
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:singleLine="true"
android:textSize="15sp"
android:textColor="@color/white" />
android:textColor="@color/white"
android:textSize="17sp" />
</LinearLayout>

View File

@@ -47,7 +47,7 @@
android:layout_marginTop="8dp"
android:text="天气预报"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -92,7 +92,7 @@
android:layout_marginTop="8dp"
android:text="爱心守护"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -142,15 +142,15 @@
android:layout_marginTop="8dp"
android:text="紧急呼叫"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_sos"
android:layout_width="64dp"
android:layout_height="80dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/sos_icon"
@@ -186,7 +186,7 @@
android:layout_marginTop="8dp"
android:text="我的闹钟"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -237,7 +237,7 @@
android:layout_marginTop="8dp"
android:text="设备状态"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -257,12 +257,12 @@
<ImageView
android:id="@+id/iv_charging"
android:layout_width="40dp"
android:layout_height="22dp"
android:layout_width="32dp"
android:layout_height="23dp"
android:layout_marginStart="32dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/charging"
android:scaleType="centerInside"
android:src="@drawable/charging_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -291,10 +291,12 @@
<ImageView
android:id="@+id/iv_wifi"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="32dp"
android:src="@drawable/wifi_icon"
android:adjustViewBounds="true"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -344,7 +346,7 @@
android:layout_marginTop="8dp"
android:text="一键加速"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -372,15 +374,15 @@
android:layout_marginTop="8dp"
android:text="系统应用"
android:textColor="@color/black"
android:textSize="15sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_allapp"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="100dp"
android:layout_height="100dp"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:src="@drawable/systemapp_icon"

View File

@@ -8,9 +8,11 @@
<ImageView
android:id="@+id/iv_icon"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_horizontal"
android:layout_width="128dp"
android:layout_height="128dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
app:srcCompat="@mipmap/ic_launcher" />
<TextView
@@ -20,7 +22,7 @@
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:singleLine="true"
android:textSize="15sp"
android:textColor="@color/white" />
android:textColor="@color/white"
android:textSize="17sp" />
</LinearLayout>

View File

@@ -6,28 +6,26 @@
android:layout_height="match_parent"
tools:context=".activity.NoticeActivity">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="72dp"
android:text="测试标题"
android:layout_marginTop="32dp"
android:text="爱心提醒"
android:textColor="@color/white"
android:textSize="50sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:id="@+id/cl_voice"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginTop="108dp"
android:layout_marginTop="32dp"
android:background="@drawable/notice_voice_background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title">
@@ -36,8 +34,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="30秒"
android:textSize="30sp"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -51,18 +49,38 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_vp"
android:layout_width="360dp"
android:layout_height="360dp"
app:layout_constraintBottom_toTopOf="@+id/bt_ok"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_voice">
<com.uiui.os.view.JzvdStdAssert
android:id="@+id/jz_video"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
android:id="@+id/bt_ok"
android:layout_width="100dp"
android:layout_height="100dp"
android:text="OK"
android:textSize="30sp"
android:textColor="@color/white"
android:layout_marginBottom="148dp"
android:layout_marginBottom="32dp"
android:background="@drawable/ok_background"
android:text="OK"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
tools:context=".fragment.AppListFragment">
<com.uiui.os.view.MyGridLayout

View File

@@ -10,10 +10,10 @@
<ImageView
android:id="@+id/iv"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop" />
android:scaleType="fitCenter" />
<TextView
android:id="@+id/tv"

View File

@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#37353a</color>
<color name="colorPrimary">#343336</color>
<color name="colorPrimaryDark">#272727</color>
<color name="colorAccent">#454347</color>
<color name="white">#ffffff</color>
<color name="transparent_white">#FFFFFF</color>
<color name="transparent">#00FFFFFF</color>
<color name="black">#000000</color>
<color name="tv_add_color">#4880ff</color>
@@ -13,5 +14,6 @@
<color name="notice_blue">#0480FF</color>
<color name="ok_button">#4D4B50</color>
<color name="red">#FF0000</color>
<color name="actions_item_pressed">#424144</color>
</resources>

View File

@@ -3,7 +3,7 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="actions_item_font">14sp</dimen>
<dimen name="actions_item_font">18sp</dimen>
<dimen name="actions_item_drawablePaddding">10dip</dimen>
</resources>