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

version:6.3

Browse Source 
fix:
update:优化管控页面
This commit is contained in:
tongtongstudio
2022-11-17 09:36:01 +08:00
parent 2ae033b3f5
commit b87c2e99b9
11 changed files with 105 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

3
app/src/main/res/drawable/shape_thumb_icon.xml
View File

@@ -5,6 +5,9 @@
<size
android:width="@dimen/dp_14"
android:height="@dimen/dp_14" />
<stroke
android:width="@dimen/dp_2"
android:color="#e1e8f0" />
<solid android:color="#535353" />
</shape>

80
app/src/main/res/layout-land/fragment_control.xml
View File

@@ -7,7 +7,6 @@
android:background="@drawable/control_background"
tools:context=".fragment.ControlFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -39,8 +38,8 @@
<ImageView
android:id="@+id/iv_flashlight"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
@@ -53,14 +52,15 @@
android:id="@+id/tv_flashlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_32"
android:text="00:00"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.211"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView
android:id="@+id/tv_flashlight_switch"
@@ -70,10 +70,9 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tv_flashlight"
app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
app:layout_constraintTop_toBottomOf="@+id/tv_flashlight"
app:layout_constraintVertical_bias="0.285" />
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -86,8 +85,8 @@
<ImageView
android:id="@+id/iv_wifi"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
@@ -100,14 +99,15 @@
android:id="@+id/tv_wifi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_32"
android:text="WIFI"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.211"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_wifi"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView
android:id="@+id/tv_wifi_ssid"
@@ -117,10 +117,9 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tv_wifi"
app:layout_constraintStart_toStartOf="@+id/tv_wifi"
app:layout_constraintTop_toBottomOf="@+id/tv_wifi"
app:layout_constraintVertical_bias="0.285" />
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
@@ -180,7 +179,6 @@
android:layout_weight="1"
android:background="@drawable/control_background_item">
<com.uiui.aios.view.RulerSeekBar
android:id="@+id/seekBar"
android:layout_width="0dp"
@@ -192,15 +190,16 @@
android:progressDrawable="@drawable/shape_progress_drawable"
android:thumb="@drawable/shape_thumb_icon"
android:thumbOffset="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/linearLayout"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/linearLayout"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:id="@+id/imageView"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8"
android:src="@drawable/font_size"
app:layout_constraintBottom_toBottomOf="parent"
@@ -209,19 +208,19 @@
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_32"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/seekBar">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:gravity="start"
android:paddingStart="@dimen/dp_8"
android:text="标准"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
@@ -247,7 +246,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:gravity="end"
android:paddingEnd="@dimen/dp_8"
android:text="最大"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
@@ -295,8 +295,8 @@
<ImageView
android:id="@+id/iv_bt"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
@@ -309,14 +309,15 @@
android:id="@+id/tv_bt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_32"
android:text="蓝牙"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.211"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_bt"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView
android:id="@+id/tv_bt_ssid"
@@ -326,10 +327,9 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tv_bt"
app:layout_constraintStart_toStartOf="@+id/tv_bt"
app:layout_constraintTop_toBottomOf="@+id/tv_bt"
app:layout_constraintVertical_bias="0.285" />
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -342,8 +342,8 @@
<ImageView
android:id="@+id/iv_battery"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
@@ -356,14 +356,15 @@
android:id="@+id/tv_battery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_32"
android:text="电量"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.211"
app:layout_constraintHorizontal_bias="0.234"
app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32" />
<TextView
android:id="@+id/tv_electricity"
@@ -373,11 +374,10 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tv_battery"
app:layout_constraintStart_toEndOf="@+id/tv_battery"
app:layout_constraintStart_toStartOf="@+id/tv_battery"
app:layout_constraintTop_toBottomOf="@+id/tv_battery"
app:layout_constraintVertical_bias="0.285" />
app:layout_constraintVertical_bias="0.2" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

6
app/src/main/res/layout-land/item_weather.xml
View File

@@ -29,7 +29,7 @@
android:maxLines="1"
android:singleLine="true"
android:text="17:48"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toTopOf="@+id/iv_weather"
app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:text="15-22"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="26sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@@ -10,6 +10,7 @@
<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"
@@ -46,24 +47,24 @@
android:id="@+id/tv_flashlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28"
android:text="手电筒"
android:text="00:00"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.25"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/tv_flashlight_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:text="关"
android:layout_marginTop="@dimen/dp_6"
android:text="11月15日"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/tv_flashlight"
app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
app:layout_constraintTop_toBottomOf="@+id/tv_flashlight" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -93,24 +94,24 @@
android:id="@+id/tv_wifi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28"
android:text="WIFI"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.25"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_wifi"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/tv_wifi_ssid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_6"
android:text="ssid"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/tv_wifi"
app:layout_constraintStart_toStartOf="@+id/tv_wifi"
app:layout_constraintTop_toBottomOf="@+id/tv_wifi" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -147,24 +148,24 @@
android:id="@+id/tv_bt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28"
android:text="蓝牙"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.25"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_bt"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/tv_bt_ssid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_6"
android:text="ssid"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/tv_bt"
app:layout_constraintStart_toStartOf="@+id/tv_bt"
app:layout_constraintTop_toBottomOf="@+id/tv_bt" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -193,24 +194,24 @@
android:id="@+id/tv_battery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_28"
android:text="电量"
android:textColor="@color/white"
android:textSize="@dimen/sp_16"
android:textSize="@dimen/sp_17"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.25"
app:layout_constraintHorizontal_bias="0.2"
app:layout_constraintStart_toEndOf="@+id/iv_battery"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<TextView
android:id="@+id/tv_electricity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_6"
android:text="100%"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="@+id/tv_battery"
app:layout_constraintStart_toStartOf="@+id/tv_battery"
app:layout_constraintTop_toBottomOf="@+id/tv_battery" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -323,11 +324,8 @@
<com.uiui.aios.view.RulerSeekBar
android:id="@+id/seekBar"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_32"
android:max="3"
android:maxHeight="@dimen/dp_14"
android:minHeight="@dimen/dp_14"
@@ -335,15 +333,15 @@
android:progressDrawable="@drawable/shape_progress_drawable"
android:thumb="@drawable/shape_thumb_icon"
android:thumbOffset="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/linearLayout4"
app:layout_constraintStart_toStartOf="@+id/linearLayout4"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:id="@+id/imageView4"
android:layout_width="@dimen/dp_36"
android:layout_height="@dimen/dp_36"
android:layout_marginStart="@dimen/dp_8"
android:src="@drawable/font_size"
app:layout_constraintBottom_toBottomOf="parent"
@@ -352,16 +350,19 @@
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView4"
app:layout_constraintTop_toBottomOf="@+id/seekBar">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:gravity="start"
android:paddingStart="@dimen/dp_8"
android:text="标准"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"
@@ -387,7 +388,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:gravity="end"
android:paddingEnd="@dimen/dp_8"
android:text="最大"
android:textColor="@color/white"
android:textSize="@dimen/sp_12"

6
app/src/main/res/layout-port/item_weather.xml
View File

@@ -32,7 +32,7 @@
android:layout_marginStart="@dimen/dp_32"
android:layout_marginTop="@dimen/dp_32"
android:text="17:48"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -53,7 +53,7 @@
android:id="@+id/tv_weather"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:text="15-22"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/black"
android:textColor="@color/white"
android:textSize="26sp"
app:layout_constraintEnd_toEndOf="@+id/iv_weather"
app:layout_constraintStart_toStartOf="@+id/iv_weather"