diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 5f1063e..7c34acf 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -179,7 +179,7 @@
energy = 50
}
- if (energy > 13) {
+ if (energy > 6) {
depthButton.isEnabled = true
depthButton.setTextColor(Color.WHITE)
depthButton.setBackgroundResource(R.mipmap.left_button_enable)
@@ -211,7 +211,7 @@
fastSoundPool.stop(fastResId)
false
}
- } else if (energy in 11..41) {
+ } else if (energy in 6..41) {
isPlaying = if (!isPlaying) {
slowSoundPool.play(slowResId, 1f, 1f, 0, 0, 1f)
true
@@ -221,7 +221,7 @@
}
}
- if (energy < 13) {//47°
+ if (energy < 6) {//47°
energyTipsView.text = "标识器信号较弱,可能距离较远"
} else if (energy > 41) {//148°
energyTipsView.text = "标识器信号极强,可能在正下方"
@@ -229,7 +229,7 @@
energyTipsView.text = "已靠近标识器,请继续移动位置"
}
- if (energy < 13) {
+ if (energy < 6) {
energyTipsView.setTextColor(Color.parseColor("#8D1717"))
energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red)
} else {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 5f1063e..7c34acf 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -179,7 +179,7 @@
energy = 50
}
- if (energy > 13) {
+ if (energy > 6) {
depthButton.isEnabled = true
depthButton.setTextColor(Color.WHITE)
depthButton.setBackgroundResource(R.mipmap.left_button_enable)
@@ -211,7 +211,7 @@
fastSoundPool.stop(fastResId)
false
}
- } else if (energy in 11..41) {
+ } else if (energy in 6..41) {
isPlaying = if (!isPlaying) {
slowSoundPool.play(slowResId, 1f, 1f, 0, 0, 1f)
true
@@ -221,7 +221,7 @@
}
}
- if (energy < 13) {//47°
+ if (energy < 6) {//47°
energyTipsView.text = "标识器信号较弱,可能距离较远"
} else if (energy > 41) {//148°
energyTipsView.text = "标识器信号极强,可能在正下方"
@@ -229,7 +229,7 @@
energyTipsView.text = "已靠近标识器,请继续移动位置"
}
- if (energy < 13) {
+ if (energy < 6) {
energyTipsView.setTextColor(Color.parseColor("#8D1717"))
energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red)
} else {
diff --git a/app/src/main/res/font/fzdhjt.ttf b/app/src/main/res/font/fzdhjt.ttf
new file mode 100644
index 0000000..1c14f7f
--- /dev/null
+++ b/app/src/main/res/font/fzdhjt.ttf
Binary files differ
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 5f1063e..7c34acf 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -179,7 +179,7 @@
energy = 50
}
- if (energy > 13) {
+ if (energy > 6) {
depthButton.isEnabled = true
depthButton.setTextColor(Color.WHITE)
depthButton.setBackgroundResource(R.mipmap.left_button_enable)
@@ -211,7 +211,7 @@
fastSoundPool.stop(fastResId)
false
}
- } else if (energy in 11..41) {
+ } else if (energy in 6..41) {
isPlaying = if (!isPlaying) {
slowSoundPool.play(slowResId, 1f, 1f, 0, 0, 1f)
true
@@ -221,7 +221,7 @@
}
}
- if (energy < 13) {//47°
+ if (energy < 6) {//47°
energyTipsView.text = "标识器信号较弱,可能距离较远"
} else if (energy > 41) {//148°
energyTipsView.text = "标识器信号极强,可能在正下方"
@@ -229,7 +229,7 @@
energyTipsView.text = "已靠近标识器,请继续移动位置"
}
- if (energy < 13) {
+ if (energy < 6) {
energyTipsView.setTextColor(Color.parseColor("#8D1717"))
energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red)
} else {
diff --git a/app/src/main/res/font/fzdhjt.ttf b/app/src/main/res/font/fzdhjt.ttf
new file mode 100644
index 0000000..1c14f7f
--- /dev/null
+++ b/app/src/main/res/font/fzdhjt.ttf
Binary files differ
diff --git a/app/src/main/res/layout/activity_search_label.xml b/app/src/main/res/layout/activity_search_label.xml
index 950e00f..bf9c019 100644
--- a/app/src/main/res/layout/activity_search_label.xml
+++ b/app/src/main/res/layout/activity_search_label.xml
@@ -40,20 +40,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:fontFamily="@font/digifaw"
+ android:fontFamily="@font/fzdhjt"
android:text="180"
android:textColor="#8C5700"
- android:textSize="20sp"
- android:textStyle="bold" />
+ android:textSize="20sp" />
+ android:textSize="20sp" />
@@ -65,12 +64,13 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_75"
android:background="@mipmap/bg_small_text_red"
+ android:fontFamily="@font/fzdhjt"
android:gravity="center_horizontal"
android:paddingHorizontal="@dimen/dp_10"
android:paddingVertical="@dimen/dp_10"
android:text="未检测到标识器"
android:textColor="#8D1717"
- android:textStyle="bold" />
+ android:textSize="@dimen/sp_16" />
+ android:textSize="@dimen/sp_20" />
+ android:textSize="@dimen/sp_22" />
+ android:textSize="@dimen/sp_22" />
\ No newline at end of file