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 0000000..e57a14b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/back.png differ
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">
+
+
+
+
+
+
+
+