diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 5869ca2..21f80b3 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.detector.view import android.os.Bundle +import android.util.Log import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -11,6 +12,8 @@ import com.casic.detector.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState @@ -19,6 +22,7 @@ class LoginActivity : KotlinBaseActivity() { + private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } @@ -98,6 +102,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) + + Log.d(kTag, "setupTopBarLayout => [${getScreenWidth()}, ${getScreenHeight()}]") } override fun onResume() { diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 5869ca2..21f80b3 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.detector.view import android.os.Bundle +import android.util.Log import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -11,6 +12,8 @@ import com.casic.detector.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState @@ -19,6 +22,7 @@ class LoginActivity : KotlinBaseActivity() { + private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } @@ -98,6 +102,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) + + Log.d(kTag, "setupTopBarLayout => [${getScreenWidth()}, ${getScreenHeight()}]") } override fun onResume() { 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 b5b15f1..5f1063e 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -108,8 +108,6 @@ } override fun initEvent() { - backButton.setOnClickListener { finish() } - depthButton.setOnClickListener { isDetectDepth = true val result = DataBaseManager.get.queryLabelById(identifierId) @@ -183,16 +181,26 @@ if (energy > 13) { depthButton.isEnabled = true + depthButton.setTextColor(Color.WHITE) + depthButton.setBackgroundResource(R.mipmap.left_button_enable) degreeButton.isEnabled = true + degreeButton.setTextColor(Color.WHITE) + degreeButton.setBackgroundResource(R.mipmap.right_button_enable) - searchResultView.text = "已搜索到标识器" - searchResultView.setTextColor(Color.RED) + searchResultView.text = "已检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8C5700")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } else { depthButton.isEnabled = false + depthButton.setTextColor(Color.parseColor("#CCCCCC")) + depthButton.setBackgroundResource(R.mipmap.left_button_disable) degreeButton.isEnabled = false + degreeButton.setTextColor(Color.parseColor("#CCCCCC")) + degreeButton.setBackgroundResource(R.mipmap.right_button_disable) - searchResultView.text = "标识器搜索中" - searchResultView.setTextColor(Color.WHITE) + searchResultView.text = "未检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8D1717")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red) } if (energy > 41) { @@ -215,14 +223,18 @@ if (energy < 13) {//47° energyTipsView.text = "标识器信号较弱，可能距离较远" - energyTipsView.setTextColor(Color.RED) - //重新测试更精确的能量值，不让测距 } else if (energy > 41) {//148° - energyTipsView.text = "信号极强，接近标识器正上方" - energyTipsView.setTextColor(Color.GREEN) + energyTipsView.text = "标识器信号极强，可能在正下方" } else {//[47°,148°] - energyTipsView.text = "已靠近标识器，请继续移动" - energyTipsView.setTextColor(Color.YELLOW) + energyTipsView.text = "已靠近标识器，请继续移动位置" + } + + if (energy < 13) { + energyTipsView.setTextColor(Color.parseColor("#8D1717")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red) + } else { + energyTipsView.setTextColor(Color.parseColor("#8C5700")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } //转换为转动的角度 @@ -295,7 +307,7 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() initLayoutImmersionBar(rootView) } diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 5869ca2..21f80b3 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.detector.view import android.os.Bundle +import android.util.Log import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -11,6 +12,8 @@ import com.casic.detector.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState @@ -19,6 +22,7 @@ class LoginActivity : KotlinBaseActivity() { + private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } @@ -98,6 +102,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) + + Log.d(kTag, "setupTopBarLayout => [${getScreenWidth()}, ${getScreenHeight()}]") } override fun onResume() { 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 b5b15f1..5f1063e 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -108,8 +108,6 @@ } override fun initEvent() { - backButton.setOnClickListener { finish() } - depthButton.setOnClickListener { isDetectDepth = true val result = DataBaseManager.get.queryLabelById(identifierId) @@ -183,16 +181,26 @@ if (energy > 13) { depthButton.isEnabled = true + depthButton.setTextColor(Color.WHITE) + depthButton.setBackgroundResource(R.mipmap.left_button_enable) degreeButton.isEnabled = true + degreeButton.setTextColor(Color.WHITE) + degreeButton.setBackgroundResource(R.mipmap.right_button_enable) - searchResultView.text = "已搜索到标识器" - searchResultView.setTextColor(Color.RED) + searchResultView.text = "已检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8C5700")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } else { depthButton.isEnabled = false + depthButton.setTextColor(Color.parseColor("#CCCCCC")) + depthButton.setBackgroundResource(R.mipmap.left_button_disable) degreeButton.isEnabled = false + degreeButton.setTextColor(Color.parseColor("#CCCCCC")) + degreeButton.setBackgroundResource(R.mipmap.right_button_disable) - searchResultView.text = "标识器搜索中" - searchResultView.setTextColor(Color.WHITE) + searchResultView.text = "未检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8D1717")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red) } if (energy > 41) { @@ -215,14 +223,18 @@ if (energy < 13) {//47° energyTipsView.text = "标识器信号较弱，可能距离较远" - energyTipsView.setTextColor(Color.RED) - //重新测试更精确的能量值，不让测距 } else if (energy > 41) {//148° - energyTipsView.text = "信号极强，接近标识器正上方" - energyTipsView.setTextColor(Color.GREEN) + energyTipsView.text = "标识器信号极强，可能在正下方" } else {//[47°,148°] - energyTipsView.text = "已靠近标识器，请继续移动" - energyTipsView.setTextColor(Color.YELLOW) + energyTipsView.text = "已靠近标识器，请继续移动位置" + } + + if (energy < 13) { + energyTipsView.setTextColor(Color.parseColor("#8D1717")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red) + } else { + energyTipsView.setTextColor(Color.parseColor("#8C5700")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } //转换为转动的角度 @@ -295,7 +307,7 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() initLayoutImmersionBar(rootView) } diff --git a/app/src/main/res/drawable/btn_back.xml b/app/src/main/res/drawable/btn_back.xml deleted file mode 100644 index f3405f5..0000000 --- a/app/src/main/res/drawable/btn_back.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 5869ca2..21f80b3 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.detector.view import android.os.Bundle +import android.util.Log import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -11,6 +12,8 @@ import com.casic.detector.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState @@ -19,6 +22,7 @@ class LoginActivity : KotlinBaseActivity() { + private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } @@ -98,6 +102,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) + + Log.d(kTag, "setupTopBarLayout => [${getScreenWidth()}, ${getScreenHeight()}]") } override fun onResume() { 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 b5b15f1..5f1063e 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -108,8 +108,6 @@ } override fun initEvent() { - backButton.setOnClickListener { finish() } - depthButton.setOnClickListener { isDetectDepth = true val result = DataBaseManager.get.queryLabelById(identifierId) @@ -183,16 +181,26 @@ if (energy > 13) { depthButton.isEnabled = true + depthButton.setTextColor(Color.WHITE) + depthButton.setBackgroundResource(R.mipmap.left_button_enable) degreeButton.isEnabled = true + degreeButton.setTextColor(Color.WHITE) + degreeButton.setBackgroundResource(R.mipmap.right_button_enable) - searchResultView.text = "已搜索到标识器" - searchResultView.setTextColor(Color.RED) + searchResultView.text = "已检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8C5700")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } else { depthButton.isEnabled = false + depthButton.setTextColor(Color.parseColor("#CCCCCC")) + depthButton.setBackgroundResource(R.mipmap.left_button_disable) degreeButton.isEnabled = false + degreeButton.setTextColor(Color.parseColor("#CCCCCC")) + degreeButton.setBackgroundResource(R.mipmap.right_button_disable) - searchResultView.text = "标识器搜索中" - searchResultView.setTextColor(Color.WHITE) + searchResultView.text = "未检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8D1717")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red) } if (energy > 41) { @@ -215,14 +223,18 @@ if (energy < 13) {//47° energyTipsView.text = "标识器信号较弱，可能距离较远" - energyTipsView.setTextColor(Color.RED) - //重新测试更精确的能量值，不让测距 } else if (energy > 41) {//148° - energyTipsView.text = "信号极强，接近标识器正上方" - energyTipsView.setTextColor(Color.GREEN) + energyTipsView.text = "标识器信号极强，可能在正下方" } else {//[47°,148°] - energyTipsView.text = "已靠近标识器，请继续移动" - energyTipsView.setTextColor(Color.YELLOW) + energyTipsView.text = "已靠近标识器，请继续移动位置" + } + + if (energy < 13) { + energyTipsView.setTextColor(Color.parseColor("#8D1717")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red) + } else { + energyTipsView.setTextColor(Color.parseColor("#8C5700")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } //转换为转动的角度 @@ -295,7 +307,7 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() initLayoutImmersionBar(rootView) } diff --git a/app/src/main/res/drawable/btn_back.xml b/app/src/main/res/drawable/btn_back.xml deleted file mode 100644 index f3405f5..0000000 --- a/app/src/main/res/drawable/btn_back.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml index 0be7d94..d0b98a0 100644 --- a/app/src/main/res/drawable/ic_arrow.xml +++ b/app/src/main/res/drawable/ic_arrow.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index 5869ca2..21f80b3 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,6 +1,7 @@ package com.casic.detector.view import android.os.Bundle +import android.util.Log import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -11,6 +12,8 @@ import com.casic.detector.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.getScreenHeight +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.vm.LoadState @@ -19,6 +22,7 @@ class LoginActivity : KotlinBaseActivity() { + private val kTag = "LoginActivity" private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } @@ -98,6 +102,8 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) + + Log.d(kTag, "setupTopBarLayout => [${getScreenWidth()}, ${getScreenHeight()}]") } override fun onResume() { 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 b5b15f1..5f1063e 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -108,8 +108,6 @@ } override fun initEvent() { - backButton.setOnClickListener { finish() } - depthButton.setOnClickListener { isDetectDepth = true val result = DataBaseManager.get.queryLabelById(identifierId) @@ -183,16 +181,26 @@ if (energy > 13) { depthButton.isEnabled = true + depthButton.setTextColor(Color.WHITE) + depthButton.setBackgroundResource(R.mipmap.left_button_enable) degreeButton.isEnabled = true + degreeButton.setTextColor(Color.WHITE) + degreeButton.setBackgroundResource(R.mipmap.right_button_enable) - searchResultView.text = "已搜索到标识器" - searchResultView.setTextColor(Color.RED) + searchResultView.text = "已检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8C5700")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } else { depthButton.isEnabled = false + depthButton.setTextColor(Color.parseColor("#CCCCCC")) + depthButton.setBackgroundResource(R.mipmap.left_button_disable) degreeButton.isEnabled = false + degreeButton.setTextColor(Color.parseColor("#CCCCCC")) + degreeButton.setBackgroundResource(R.mipmap.right_button_disable) - searchResultView.text = "标识器搜索中" - searchResultView.setTextColor(Color.WHITE) + searchResultView.text = "未检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8D1717")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red) } if (energy > 41) { @@ -215,14 +223,18 @@ if (energy < 13) {//47° energyTipsView.text = "标识器信号较弱，可能距离较远" - energyTipsView.setTextColor(Color.RED) - //重新测试更精确的能量值，不让测距 } else if (energy > 41) {//148° - energyTipsView.text = "信号极强，接近标识器正上方" - energyTipsView.setTextColor(Color.GREEN) + energyTipsView.text = "标识器信号极强，可能在正下方" } else {//[47°,148°] - energyTipsView.text = "已靠近标识器，请继续移动" - energyTipsView.setTextColor(Color.YELLOW) + energyTipsView.text = "已靠近标识器，请继续移动位置" + } + + if (energy < 13) { + energyTipsView.setTextColor(Color.parseColor("#8D1717")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red) + } else { + energyTipsView.setTextColor(Color.parseColor("#8C5700")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } //转换为转动的角度 @@ -295,7 +307,7 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() initLayoutImmersionBar(rootView) } diff --git a/app/src/main/res/drawable/btn_back.xml b/app/src/main/res/drawable/btn_back.xml deleted file mode 100644 index f3405f5..0000000 --- a/app/src/main/res/drawable/btn_back.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml index 0be7d94..d0b98a0 100644 --- a/app/src/main/res/drawable/ic_arrow.xml +++ b/app/src/main/res/drawable/ic_arrow.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 79d766a..5970be0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -96,18 +96,19 @@ [${getScreenWidth()}, ${getScreenHeight()}]") } override fun onResume() { 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 b5b15f1..5f1063e 100644 --- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt +++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt @@ -108,8 +108,6 @@ } override fun initEvent() { - backButton.setOnClickListener { finish() } - depthButton.setOnClickListener { isDetectDepth = true val result = DataBaseManager.get.queryLabelById(identifierId) @@ -183,16 +181,26 @@ if (energy > 13) { depthButton.isEnabled = true + depthButton.setTextColor(Color.WHITE) + depthButton.setBackgroundResource(R.mipmap.left_button_enable) degreeButton.isEnabled = true + degreeButton.setTextColor(Color.WHITE) + degreeButton.setBackgroundResource(R.mipmap.right_button_enable) - searchResultView.text = "已搜索到标识器" - searchResultView.setTextColor(Color.RED) + searchResultView.text = "已检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8C5700")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } else { depthButton.isEnabled = false + depthButton.setTextColor(Color.parseColor("#CCCCCC")) + depthButton.setBackgroundResource(R.mipmap.left_button_disable) degreeButton.isEnabled = false + degreeButton.setTextColor(Color.parseColor("#CCCCCC")) + degreeButton.setBackgroundResource(R.mipmap.right_button_disable) - searchResultView.text = "标识器搜索中" - searchResultView.setTextColor(Color.WHITE) + searchResultView.text = "未检测到标识器" + searchResultView.setTextColor(Color.parseColor("#8D1717")) + searchResultView.setBackgroundResource(R.mipmap.bg_small_text_red) } if (energy > 41) { @@ -215,14 +223,18 @@ if (energy < 13) {//47° energyTipsView.text = "标识器信号较弱，可能距离较远" - energyTipsView.setTextColor(Color.RED) - //重新测试更精确的能量值，不让测距 } else if (energy > 41) {//148° - energyTipsView.text = "信号极强，接近标识器正上方" - energyTipsView.setTextColor(Color.GREEN) + energyTipsView.text = "标识器信号极强，可能在正下方" } else {//[47°,148°] - energyTipsView.text = "已靠近标识器，请继续移动" - energyTipsView.setTextColor(Color.YELLOW) + energyTipsView.text = "已靠近标识器，请继续移动位置" + } + + if (energy < 13) { + energyTipsView.setTextColor(Color.parseColor("#8D1717")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_red) + } else { + energyTipsView.setTextColor(Color.parseColor("#8C5700")) + energyTipsView.setBackgroundResource(R.mipmap.bg_small_text_yellow) } //转换为转动的角度 @@ -295,7 +307,7 @@ } override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() + ImmersionBar.with(this).statusBarDarkFont(false).init() initLayoutImmersionBar(rootView) } diff --git a/app/src/main/res/drawable/btn_back.xml b/app/src/main/res/drawable/btn_back.xml deleted file mode 100644 index f3405f5..0000000 --- a/app/src/main/res/drawable/btn_back.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow.xml b/app/src/main/res/drawable/ic_arrow.xml index 0be7d94..d0b98a0 100644 --- a/app/src/main/res/drawable/ic_arrow.xml +++ b/app/src/main/res/drawable/ic_arrow.xml @@ -1,6 +1,6 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 79d766a..5970be0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -96,18 +96,19 @@ - - - - + android:layout_width="350dp" + android:layout_height="350dp" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/dp_30" + android:background="@mipmap/dashboard"> - - + - + - + - - - - - - - -