version:beta
fix: update:优化seekbar
This commit is contained in:
@@ -66,8 +66,8 @@ public class ControlActivity extends AppCompatActivity {
|
|||||||
@BindView(R.id.tv_bt_ssid)
|
@BindView(R.id.tv_bt_ssid)
|
||||||
TextView tv_bt_ssid;
|
TextView tv_bt_ssid;
|
||||||
|
|
||||||
@BindView(R.id.tv_font_size)
|
// @BindView(R.id.tv_font_size)
|
||||||
TextView tv_font_size;
|
// TextView tv_font_size;
|
||||||
@BindView(R.id.seekBar)
|
@BindView(R.id.seekBar)
|
||||||
RulerSeekBar seekBar;
|
RulerSeekBar seekBar;
|
||||||
@BindView(R.id.seekbar_brightness)
|
@BindView(R.id.seekbar_brightness)
|
||||||
@@ -622,7 +622,7 @@ public class ControlActivity extends AppCompatActivity {
|
|||||||
} else {
|
} else {
|
||||||
font_size = mEntries.get(index);
|
font_size = mEntries.get(index);
|
||||||
}
|
}
|
||||||
tv_font_size.setText(font_size);
|
// tv_font_size.setText(font_size);
|
||||||
seekBar.setProgress(index);
|
seekBar.setProgress(index);
|
||||||
seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
|
seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
|
||||||
@Override
|
@Override
|
||||||
@@ -745,7 +745,6 @@ public class ControlActivity extends AppCompatActivity {
|
|||||||
int volume = (int) (((double) i / (double) maxVolume) * 100f);
|
int volume = (int) (((double) i / (double) maxVolume) * 100f);
|
||||||
tv_sound.setText(volume + "%");
|
tv_sound.setText(volume + "%");
|
||||||
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0);
|
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import android.graphics.Color;
|
|||||||
import android.graphics.Paint;
|
import android.graphics.Paint;
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
|
|
||||||
import android.util.AttributeSet;
|
import android.util.AttributeSet;
|
||||||
|
|
||||||
public class RulerSeekBar extends androidx.appcompat.widget.AppCompatSeekBar {
|
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) {
|
public RulerSeekBar(Context context) {
|
||||||
super(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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
app/src/main/res/drawable-hdpi/back.png
Normal file
BIN
app/src/main/res/drawable-hdpi/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
@@ -3,8 +3,8 @@
|
|||||||
android:shape="oval">
|
android:shape="oval">
|
||||||
|
|
||||||
<size
|
<size
|
||||||
android:width="30dp"
|
android:width="15dp"
|
||||||
android:height="30dp" />
|
android:height="15dp" />
|
||||||
|
|
||||||
<solid android:color="@android:color/holo_blue_light" />
|
<solid android:color="@android:color/holo_blue_light" />
|
||||||
</shape>
|
</shape>
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
android:layout_width="@dimen/dp_24"
|
android:layout_width="@dimen/dp_24"
|
||||||
android:layout_height="@dimen/dp_24"
|
android:layout_height="@dimen/dp_24"
|
||||||
android:layout_marginStart="@dimen/dp_8"
|
android:layout_marginStart="@dimen/dp_8"
|
||||||
android:src="@drawable/control_back"
|
android:src="@drawable/back"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
@@ -31,7 +31,8 @@
|
|||||||
android:layout_marginStart="@dimen/dp_4"
|
android:layout_marginStart="@dimen/dp_4"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:text="快捷控制"
|
android:text="返回桌面"
|
||||||
|
android:textColor="@color/white"
|
||||||
android:textSize="@dimen/sp_16"
|
android:textSize="@dimen/sp_16"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/iv_back"
|
app:layout_constraintStart_toEndOf="@+id/iv_back"
|
||||||
@@ -165,53 +166,90 @@
|
|||||||
android:id="@+id/seekBar"
|
android:id="@+id/seekBar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="@dimen/dp_20"
|
||||||
|
android:layout_marginEnd="@dimen/dp_20"
|
||||||
android:max="3"
|
android:max="3"
|
||||||
android:maxHeight="16dp"
|
android:maxHeight="12dp"
|
||||||
android:minHeight="16dp"
|
android:minHeight="12dp"
|
||||||
android:progress="0"
|
android:progress="0"
|
||||||
android:progressDrawable="@drawable/shape_progress_drawable"
|
android:progressDrawable="@drawable/shape_progress_drawable"
|
||||||
android:thumb="@drawable/shape_thumb_icon"
|
android:thumb="@drawable/shape_thumb_icon"
|
||||||
android:thumbOffset="0dp"
|
android:thumbOffset="0dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
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" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView21"
|
android:id="@+id/textView21"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/dp_8"
|
android:layout_marginStart="@dimen/dp_8"
|
||||||
android:layout_marginTop="@dimen/dp_8"
|
|
||||||
android:text="字体大小"
|
android:text="字体大小"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="@dimen/sp_16"
|
android:textSize="@dimen/sp_13"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:id="@+id/tv_font_size"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/dp_16"
|
android:orientation="horizontal"
|
||||||
android:text="标准"
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
android:textColor="@color/white"
|
|
||||||
android:textSize="@dimen/sp_12"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
<!-- <SeekBar-->
|
<TextView
|
||||||
<!-- android:id="@+id/seekBar"-->
|
android:layout_width="wrap_content"
|
||||||
<!-- android:layout_width="match_parent"-->
|
android:layout_height="wrap_content"
|
||||||
<!-- android:layout_height="wrap_content"-->
|
android:layout_weight="1"
|
||||||
<!-- android:layout_marginStart="@dimen/dp_32"-->
|
android:gravity="center"
|
||||||
<!-- android:layout_marginEnd="@dimen/dp_32"-->
|
android:text="标准"
|
||||||
<!-- android:max="3"-->
|
android:textColor="@color/white"
|
||||||
<!-- android:visibility="gone"-->
|
android:textSize="@dimen/sp_12"
|
||||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_font_size" />-->
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="大"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="@dimen/sp_12"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="最大"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="@dimen/sp_12"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- <SeekBar-->
|
||||||
|
<!-- android:id="@+id/seekBar"-->
|
||||||
|
<!-- android:layout_width="match_parent"-->
|
||||||
|
<!-- android:layout_height="wrap_content"-->
|
||||||
|
<!-- android:layout_marginStart="@dimen/dp_32"-->
|
||||||
|
<!-- android:layout_marginEnd="@dimen/dp_32"-->
|
||||||
|
<!-- android:max="3"-->
|
||||||
|
<!-- android:visibility="gone"-->
|
||||||
|
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||||
|
<!-- app:layout_constraintTop_toBottomOf="@+id/tv_font_size" />-->
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
android:layout_width="@dimen/dp_24"
|
android:layout_width="@dimen/dp_24"
|
||||||
android:layout_height="@dimen/dp_24"
|
android:layout_height="@dimen/dp_24"
|
||||||
android:layout_marginStart="@dimen/dp_8"
|
android:layout_marginStart="@dimen/dp_8"
|
||||||
android:src="@drawable/control_back"
|
android:src="@drawable/back"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
@@ -31,7 +31,8 @@
|
|||||||
android:layout_marginStart="@dimen/dp_4"
|
android:layout_marginStart="@dimen/dp_4"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:text="快捷控制"
|
android:text="返回桌面"
|
||||||
|
android:textColor="@color/white"
|
||||||
android:textSize="@dimen/sp_16"
|
android:textSize="@dimen/sp_16"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/iv_back"
|
app:layout_constraintStart_toEndOf="@+id/iv_back"
|
||||||
@@ -252,42 +253,78 @@
|
|||||||
android:id="@+id/seekBar"
|
android:id="@+id/seekBar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:max="2"
|
android:layout_marginStart="@dimen/dp_32"
|
||||||
android:maxHeight="16dp"
|
android:layout_marginEnd="@dimen/dp_32"
|
||||||
android:minHeight="16dp"
|
android:max="3"
|
||||||
|
android:maxHeight="12dp"
|
||||||
|
android:minHeight="12dp"
|
||||||
android:progress="0"
|
android:progress="0"
|
||||||
android:progressDrawable="@drawable/shape_progress_drawable"
|
android:progressDrawable="@drawable/shape_progress_drawable"
|
||||||
android:thumb="@drawable/shape_thumb_icon"
|
android:thumb="@drawable/shape_thumb_icon"
|
||||||
android:thumbOffset="0dp"
|
android:thumbOffset="0dp"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
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" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView21"
|
android:id="@+id/textView21"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="@dimen/dp_8"
|
android:layout_marginStart="@dimen/dp_8"
|
||||||
android:layout_marginTop="@dimen/dp_8"
|
|
||||||
android:text="字体大小"
|
android:text="字体大小"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="@dimen/sp_10"
|
android:textSize="@dimen/sp_10"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
android:id="@+id/tv_font_size"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="@dimen/dp_8"
|
android:orientation="horizontal"
|
||||||
android:text="标准"
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
android:textColor="@color/white"
|
|
||||||
android:textSize="@dimen/sp_9"
|
<TextView
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
android:layout_width="wrap_content"
|
||||||
app:layout_constraintHorizontal_bias="0.5"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
android:layout_weight="1"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
android:gravity="center"
|
||||||
|
android:text="标准"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="@dimen/sp_12"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="大"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="@dimen/sp_12"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="最大"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="@dimen/sp_12"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.5"
|
||||||
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- <SeekBar-->
|
<!-- <SeekBar-->
|
||||||
<!-- android:id="@+id/seekBar"-->
|
<!-- android:id="@+id/seekBar"-->
|
||||||
|
|||||||
Reference in New Issue
Block a user