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

version:6.4

Browse Source 
fix:
update:桌面背景更换，增加管控显示第三方应用
This commit is contained in:
fanhuitong
2022-11-19 17:43:00 +08:00
parent 94e0f9843f
commit 215669e9d3
7 changed files with 117 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/layout-land/fragment_control.xml
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="@drawable/control_background"
tools:context=".fragment.ControlFragment">
<LinearLayout
@@ -32,7 +31,7 @@
android:id="@+id/cl_flashlight"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -79,7 +78,7 @@
android:id="@+id/cl_wifi"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -127,7 +126,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1">
<SeekBar
@@ -175,7 +174,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -289,7 +288,7 @@
android:id="@+id/cl_bt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -336,7 +335,7 @@
android:id="@+id/cl_battery"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -384,7 +383,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1">
<SeekBar
@@ -433,7 +432,7 @@
android:id="@+id/cl_location"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">

108
app/src/main/res/layout-land/fragment_custom.xml
View File

@@ -20,10 +20,10 @@
android:id="@+id/cl_weather"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="3"
android:background="@drawable/custom_bg_weather"
android:visibility="visible">
@@ -43,8 +43,8 @@
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="天气预报"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -71,7 +71,7 @@
android:id="@+id/tv_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="@dimen/dp_2"
android:text="位置"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -147,10 +147,10 @@
android:id="@+id/cl_clean"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="3"
android:background="@drawable/custom_bg_clean"
tools:ignore="NestedWeights">
@@ -159,8 +159,8 @@
android:id="@+id/textView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="一键加速"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -182,8 +182,8 @@
<com.king.view.circleprogressview.CircleProgressView
android:id="@+id/cpv"
android:layout_width="144dp"
android:layout_height="144dp"
android:layout_width="@dimen/dp_128"
android:layout_height="@dimen/dp_128"
app:cpvDuration="1000"
app:cpvLabelTextColor="@color/white"
app:cpvLabelTextSize="26sp"
@@ -202,10 +202,10 @@
android:id="@+id/cl_sos"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_2"
android:layout_weight="2"
android:background="@drawable/custom_bg_sos">
@@ -213,8 +213,8 @@
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="紧急呼叫"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -256,7 +256,7 @@
<!-- android:id="@+id/cl_alarm"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_margin="8dp"-->
<!-- android:layout_margin="@dimen/dp_4"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/custom_bg"-->
<!-- tools:ignore="NestedWeights">-->
@@ -265,8 +265,8 @@
<!-- android:id="@+id/textView5"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="8dp"-->
<!-- android:layout_marginTop="8dp"-->
<!-- android:layout_marginStart="@dimen/dp_4"-->
<!-- android:layout_marginTop="@dimen/dp_4"-->
<!-- android:text="我的闹钟"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/sp_16"-->
@@ -303,10 +303,10 @@
android:id="@+id/cl_guard"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_guard">
@@ -315,8 +315,8 @@
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="爱心提醒"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -351,10 +351,10 @@
android:id="@+id/cl_health"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_health">
@@ -362,8 +362,8 @@
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="健康码"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -400,10 +400,10 @@
android:id="@+id/cl_contact"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_2"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_contact">
@@ -411,8 +411,8 @@
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="通讯录"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -436,10 +436,10 @@
android:id="@+id/cl_appstore"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_ai"
android:visibility="gone">
@@ -447,8 +447,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="应用市场"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
@@ -472,18 +472,18 @@
android:id="@+id/cl_ai"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/custom_bg_ai">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:text="AI问诊"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"

19
app/src/main/res/layout-port/fragment_control.xml
View File

@@ -4,13 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/control_background"
tools:context=".fragment.ControlFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_12"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -27,7 +25,7 @@
android:id="@+id/cl_flashlight"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -74,7 +72,7 @@
android:id="@+id/cl_wifi"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -128,7 +126,7 @@
android:id="@+id/cl_bt"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -174,7 +172,7 @@
android:id="@+id/cl_battery"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/control_background_item">
@@ -218,11 +216,10 @@
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="2">
<SeekBar
@@ -270,7 +267,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="2">
<SeekBar
@@ -318,7 +315,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="2"
android:background="@drawable/control_background_item">
@@ -416,7 +413,7 @@
android:id="@+id/cl_location"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="@dimen/dp_8"
android:layout_margin="@dimen/dp_4"
android:layout_weight="2"
android:background="@drawable/control_background_item">