From 3095e146bef558a7a24c3e54247eb7f7311715fb Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Mon, 7 Nov 2022 09:20:07 +0800 Subject: [PATCH] =?UTF-8?q?version:beta=20fix:=20update:=E4=BC=98=E5=8C=96?= =?UTF-8?q?seekbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uiuios/aios/activity/ControlActivity.java | 7 +- .../com/uiuios/aios/view/RulerSeekBar.java | 6 +- app/src/main/res/drawable-hdpi/back.png | Bin 0 -> 3251 bytes .../main/res/drawable/shape_thumb_icon.xml | 4 +- .../main/res/layout-land/activity_control.xml | 96 ++++++++++++------ .../main/res/layout-port/activity_control.xml | 75 ++++++++++---- 6 files changed, 131 insertions(+), 57 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/back.png diff --git a/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java b/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java index 0caa9d2..e785d4f 100644 --- a/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java +++ b/app/src/main/java/com/uiuios/aios/activity/ControlActivity.java @@ -66,8 +66,8 @@ public class ControlActivity extends AppCompatActivity { @BindView(R.id.tv_bt_ssid) TextView tv_bt_ssid; - @BindView(R.id.tv_font_size) - TextView tv_font_size; +// @BindView(R.id.tv_font_size) +// TextView tv_font_size; @BindView(R.id.seekBar) RulerSeekBar seekBar; @BindView(R.id.seekbar_brightness) @@ -622,7 +622,7 @@ public class ControlActivity extends AppCompatActivity { } else { font_size = mEntries.get(index); } - tv_font_size.setText(font_size); +// tv_font_size.setText(font_size); seekBar.setProgress(index); seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @Override @@ -745,7 +745,6 @@ public class ControlActivity extends AppCompatActivity { int volume = (int) (((double) i / (double) maxVolume) * 100f); tv_sound.setText(volume + "%"); mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0); - } @Override diff --git a/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java b/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java index 9fc8e56..3aa48a9 100644 --- a/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java +++ b/app/src/main/java/com/uiuios/aios/view/RulerSeekBar.java @@ -7,7 +7,6 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; import android.os.Build; - import android.util.AttributeSet; public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { @@ -35,7 +34,7 @@ public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { /** * 滑块上面是否要显示刻度线 */ - private boolean isShowTopOfThumb = false; + private boolean isShowTopOfThumb = true; public RulerSeekBar(Context context) { super(context); @@ -106,7 +105,8 @@ public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar { } //进行绘制 - canvas.drawRect(rulerLeft, rulerTop, rulerRight, rulerBottom, mRulerPaint); +// canvas.drawRect(rulerLeft, rulerTop, rulerRight, rulerBottom, mRulerPaint); + canvas.drawCircle(rulerLeft, rulerTop, 12, mRulerPaint); } } diff --git a/app/src/main/res/drawable-hdpi/back.png b/app/src/main/res/drawable-hdpi/back.png new file mode 100644 index 0000000000000000000000000000000000000000..e57a14b9b26e617b598104c19b732075f0fe2abf GIT binary patch literal 3251 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/shape_thumb_icon.xml b/app/src/main/res/drawable/shape_thumb_icon.xml index ebf38ce..c08f834 100644 --- a/app/src/main/res/drawable/shape_thumb_icon.xml +++ b/app/src/main/res/drawable/shape_thumb_icon.xml @@ -3,8 +3,8 @@ android:shape="oval"> + android:width="15dp" + android:height="15dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_control.xml b/app/src/main/res/layout-land/activity_control.xml index f04277c..c05efb2 100644 --- a/app/src/main/res/layout-land/activity_control.xml +++ b/app/src/main/res/layout-land/activity_control.xml @@ -20,7 +20,7 @@ android:layout_width="@dimen/dp_24" android:layout_height="@dimen/dp_24" android:layout_marginStart="@dimen/dp_8" - android:src="@drawable/control_back" + android:src="@drawable/back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -31,7 +31,8 @@ android:layout_marginStart="@dimen/dp_4" android:maxLines="1" android:singleLine="true" - android:text="快捷控制" + android:text="返回桌面" + android:textColor="@color/white" android:textSize="@dimen/sp_16" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/iv_back" @@ -165,53 +166,90 @@ android:id="@+id/seekBar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_20" + android:layout_marginEnd="@dimen/dp_20" android:max="3" - android:maxHeight="16dp" - android:minHeight="16dp" + android:maxHeight="12dp" + android:minHeight="12dp" android:progress="0" android:progressDrawable="@drawable/shape_progress_drawable" android:thumb="@drawable/shape_thumb_icon" android:thumbOffset="0dp" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tv_font_size" /> + app:layout_constraintTop_toBottomOf="@+id/textView21" + app:layout_constraintVertical_bias="0.0" /> - + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent"> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -31,7 +31,8 @@ android:layout_marginStart="@dimen/dp_4" android:maxLines="1" android:singleLine="true" - android:text="快捷控制" + android:text="返回桌面" + android:textColor="@color/white" android:textSize="@dimen/sp_16" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/iv_back" @@ -252,42 +253,78 @@ android:id="@+id/seekBar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:max="2" - android:maxHeight="16dp" - android:minHeight="16dp" + android:layout_marginStart="@dimen/dp_32" + android:layout_marginEnd="@dimen/dp_32" + android:max="3" + android:maxHeight="12dp" + android:minHeight="12dp" android:progress="0" android:progressDrawable="@drawable/shape_progress_drawable" android:thumb="@drawable/shape_thumb_icon" android:thumbOffset="0dp" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/tv_font_size" /> + app:layout_constraintTop_toBottomOf="@+id/textView21" + app:layout_constraintVertical_bias="0.0" /> - + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent"> + + + + + + + +