修改节拍器和调音器pad适配效果

metronome/src/main/res/layout-sw600dp-hdpi/activity_metronome_layout.xml

@@ -0,0 +1,265 @@
+<?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"
+    android:background="@mipmap/bg_play_beat_big"
+    tools:context=".MetronomeActivity">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/common_toolbar_layout" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="wrap_content"
+        android:layout_height="21dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="@dimen/qb_px_100"
+        android:layout_marginEnd="13dp"
+        android:overScrollMode="never"
+        android:scrollbars="none"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_include" />
+
+    <ImageView
+        android:id="@+id/iv_plate"
+        android:layout_width="316dp"
+        android:layout_height="316dp"
+        android:layout_marginTop="@dimen/qb_px_165"
+        android:src="@mipmap/bg_metronome"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_include" />
+
+
+    <ImageView
+        android:id="@+id/iv_plate2"
+        android:layout_width="232dp"
+        android:layout_height="232dp"
+        android:src="@mipmap/bg_metronome2"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_plate"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_plate"
+        app:layout_constraintRight_toRightOf="@+id/iv_plate"
+        app:layout_constraintTop_toTopOf="@+id/iv_plate" />
+
+    <com.cooleshow.metronome.widget.CircularSeekBar
+        android:id="@+id/cir_seekbar"
+        android:layout_width="232dp"
+        android:layout_height="232dp"
+        app:maxProgress="150"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_plate"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_plate"
+        app:layout_constraintRight_toRightOf="@+id/iv_plate"
+        app:layout_constraintTop_toTopOf="@+id/iv_plate" />
+
+
+    <ImageView
+        android:id="@+id/iv_plate3"
+        android:layout_width="178dp"
+        android:layout_height="178dp"
+        android:src="@mipmap/bg_metronome3"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_plate"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_plate"
+        app:layout_constraintRight_toRightOf="@+id/iv_plate"
+        app:layout_constraintTop_toTopOf="@+id/iv_plate" />
+    
+    <ImageView
+        android:id="@+id/iv_bg_metronome4"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_plate"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_plate"
+        app:layout_constraintRight_toRightOf="@+id/iv_plate"
+        app:layout_constraintTop_toTopOf="@+id/iv_plate"
+        android:src="@mipmap/bg_metronome4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+    
+    <TextView
+        android:id="@+id/tv_speed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="136"
+        android:textColor="@color/color_333333"
+        android:textSize="@dimen/sp_40"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_plate"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_plate"
+        app:layout_constraintRight_toRightOf="@+id/iv_plate"
+        app:layout_constraintTop_toTopOf="@+id/iv_plate"
+        tools:text="136" />
+
+
+    <ImageView
+        android:visibility="gone"
+        android:id="@+id/iv_note"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/icon_quarter_note"
+        app:layout_constraintCircle="@+id/tv_speed"
+        app:layout_constraintCircleAngle="320"
+        app:layout_constraintCircleRadius="55dp" />
+
+    <TextView
+        android:layout_marginBottom="10dp"
+        app:layout_constraintRight_toRightOf="@+id/iv_bg_metronome4"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg_metronome4"
+        app:layout_constraintBottom_toTopOf="@+id/iv_bg_metronome4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="速度"
+        android:textColor="@color/color_333333"
+        android:textSize="@dimen/sp_15" />
+
+    <ImageView
+        android:id="@+id/iv_reduce"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="11dp"
+        android:src="@mipmap/icon_metronome_bt_bg"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_plate"
+        app:layout_constraintRight_toLeftOf="@+id/iv_beat_value"
+        app:layout_constraintTop_toBottomOf="@+id/iv_plate" />
+
+    <!--    <ImageView-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:src="@mipmap/icon_reduce_symbol"-->
+    <!--        app:layout_constraintBottom_toBottomOf="@+id/iv_reduce"-->
+    <!--        app:layout_constraintLeft_toLeftOf="@+id/iv_reduce"-->
+    <!--        app:layout_constraintRight_toRightOf="@+id/iv_reduce"-->
+    <!--        app:layout_constraintTop_toTopOf="@+id/iv_reduce" />-->
+
+    <ImageView
+        android:id="@+id/iv_beat_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/icon_beat_value_bg"
+        app:layout_constraintLeft_toRightOf="@+id/iv_reduce"
+        app:layout_constraintRight_toLeftOf="@+id/iv_add"
+        app:layout_constraintTop_toTopOf="@+id/iv_reduce" />
+
+    <ImageView
+        android:id="@+id/iv_add"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/icon_metronome_add_bt_bg"
+        app:layout_constraintLeft_toRightOf="@+id/iv_beat_value"
+        app:layout_constraintRight_toRightOf="@+id/iv_plate"
+        app:layout_constraintTop_toTopOf="@+id/iv_reduce" />
+
+    <!--    <ImageView-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:src="@mipmap/icon_add_symbol"-->
+    <!--        app:layout_constraintBottom_toBottomOf="@+id/iv_add"-->
+    <!--        app:layout_constraintLeft_toLeftOf="@+id/iv_add"-->
+    <!--        app:layout_constraintRight_toRightOf="@+id/iv_add"-->
+    <!--        app:layout_constraintTop_toTopOf="@+id/iv_add" />-->
+
+    <TextView
+        android:id="@+id/tv_current_beat"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="6/4"
+        android:textColor="@color/color_1a1a1a"
+        android:textSize="@dimen/sp_19"
+        android:drawablePadding="10dp"
+        android:textStyle="bold"
+        android:drawableRight="@mipmap/icon_play_beat_arrow_down"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_beat_value"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_beat_value"
+        app:layout_constraintRight_toRightOf="@+id/iv_beat_value"
+        app:layout_constraintTop_toTopOf="@+id/iv_beat_value"
+        tools:text="6/4" />
+
+
+    <androidx.appcompat.widget.AppCompatSeekBar
+        android:id="@+id/volume_seek_bar"
+        android:layout_width="210dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:max="100"
+        android:background="@null"
+        android:maxHeight="4dp"
+        android:progress="50"
+        android:progressDrawable="@drawable/bg_volume_seekbar"
+        android:splitTrack="false"
+        android:thumb="@mipmap/icon_beat_volume_seekbar_thump"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_beat_value" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="2dp"
+        android:src="@mipmap/icon_volume_trumpet_add"
+        app:layout_constraintBottom_toBottomOf="@+id/volume_seek_bar"
+        app:layout_constraintRight_toLeftOf="@+id/volume_seek_bar"
+        app:layout_constraintTop_toTopOf="@+id/volume_seek_bar" />
+
+    <!--    <ImageView-->
+    <!--        android:layout_marginStart="8dp"-->
+    <!--        app:layout_constraintBottom_toBottomOf="@+id/volume_seek_bar"-->
+    <!--        app:layout_constraintTop_toTopOf="@+id/volume_seek_bar"-->
+    <!--        app:layout_constraintLeft_toRightOf="@+id/volume_seek_bar"-->
+    <!--        android:src="@mipmap/icon_volume_trumpet_add"-->
+    <!--        android:layout_width="wrap_content"-->
+    <!--        android:layout_height="wrap_content"/>-->
+
+    <TextView
+        android:id="@+id/tv_volume_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="6dp"
+        android:textColor="@color/color_58a2ec"
+        android:textSize="@dimen/sp_16"
+        app:layout_constraintBottom_toBottomOf="@+id/volume_seek_bar"
+        app:layout_constraintLeft_toRightOf="@+id/volume_seek_bar"
+        app:layout_constraintTop_toTopOf="@+id/volume_seek_bar"
+        tools:text="40" />
+
+
+    <LinearLayout
+        android:id="@+id/ll_play"
+        android:layout_width="0dp"
+        android:layout_height="54dp"
+        android:layout_marginStart="@dimen/qb_px_103"
+        android:layout_marginTop="@dimen/qb_px_114"
+        android:layout_marginEnd="@dimen/qb_px_103"
+        android:background="@drawable/shape_00acff_27dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_beat_value">
+
+        <TextView
+            android:id="@+id/tv_play"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="播放"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_18"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/iv_play_status_tag"
+            android:layout_marginStart="10dp"
+            android:src="@mipmap/icon_play_beat_bt_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

musictuner/src/main/res/layout/activity_music_tuner_layout.xml

@@ -325,22 +325,32 @@
                 app:constraint_referenced_ids="tv_transposing_result,iv_transposing_tag,tv_original_result,tv_transposing_result_title,tv_original_result_title" />
 
             <ImageView
+                android:layout_marginStart="16dp"
+                android:scaleType="fitXY"
                 android:id="@+id/iv_left_bg"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:src="@drawable/bg_music_fork"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@+id/iv_right_bg"
+                app:layout_constraintRight_toLeftOf="@+id/guide_line_center"
                 app:layout_constraintTop_toBottomOf="@+id/iv_bottom_bg" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:layout_width="wrap_content"
+                android:orientation="vertical"
+                android:id="@+id/guide_line_center"
+                app:layout_constraintGuide_percent="0.5"
+                android:layout_height="wrap_content"/>
 
             <ImageView
+                android:layout_marginEnd="16dp"
+                android:scaleType="fitXY"
                 android:id="@+id/iv_right_bg"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:src="@drawable/bg_tuner_music"
-                app:layout_constraintLeft_toRightOf="@+id/iv_left_bg"
+                app:layout_constraintLeft_toRightOf="@+id/guide_line_center"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/iv_left_bg" />
 
@@ -371,6 +381,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
+                app:layout_constraintRight_toLeftOf="@+id/iv_play_metronome"
                 android:src="@drawable/icon_metronome_speed_bg"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -416,6 +427,7 @@
 
 
             <ImageView
+                app:layout_constraintLeft_toRightOf="@+id/iv_play_metronome"
                 android:layout_marginEnd="15dp"
                 android:id="@+id/iv_metronome_mode_bg"
                 android:layout_width="wrap_content"