diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge.png b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
new file mode 100644
index 0000000..3de90c6
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge.png b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
new file mode 100644
index 0000000..3de90c6
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
new file mode 100644
index 0000000..bbf1cf8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge.png b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
new file mode 100644
index 0000000..3de90c6
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
new file mode 100644
index 0000000..bbf1cf8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point.png b/app/src/main/res/mipmap-xxhdpi/robot_point.png
new file mode 100644
index 0000000..2f808c8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge.png b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
new file mode 100644
index 0000000..3de90c6
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
new file mode 100644
index 0000000..bbf1cf8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point.png b/app/src/main/res/mipmap-xxhdpi/robot_point.png
new file mode 100644
index 0000000..2f808c8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point_main.png b/app/src/main/res/mipmap-xxhdpi/robot_point_main.png
new file mode 100644
index 0000000..b3b4e58
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point_main.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge.png b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
new file mode 100644
index 0000000..3de90c6
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
new file mode 100644
index 0000000..bbf1cf8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point.png b/app/src/main/res/mipmap-xxhdpi/robot_point.png
new file mode 100644
index 0000000..2f808c8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point_main.png b/app/src/main/res/mipmap-xxhdpi/robot_point_main.png
new file mode 100644
index 0000000..b3b4e58
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_recharge.png b/app/src/main/res/mipmap-xxhdpi/robot_recharge.png
new file mode 100644
index 0000000..a124228
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_recharge.png
Binary files differ
diff --git a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
index a946830..42c32df 100644
--- a/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
+++ b/app/src/main/java/com/casic/br/view/device/SweepingRobotActivity.kt
@@ -5,6 +5,7 @@
import android.util.Log
import com.alibaba.fastjson.JSONObject
import com.casic.br.R
+import com.casic.br.extensions.createCommand
import com.casic.br.extensions.initLayoutImmersionBar
import com.casic.br.extensions.toChineseTypeName
import com.casic.br.utils.CommandManager
@@ -80,6 +81,7 @@
}
"25" -> {
//Power on button
+ turnOffRadioButton.isChecked = parseObject[it] as Boolean
}
"26" -> {
//清扫方向
@@ -141,7 +143,7 @@
}
"38" -> {
//清扫时间
- workingTimeView.text = "${parseObject[it]}'"
+ workingTimeView.text = "${parseObject[it]}min"
}
"43" -> {
//声音
@@ -169,6 +171,35 @@
}
})
+ turnOffRadioButton.setOnClickListener {
+ if (turnOffRadioButton.isChecked) {
+ //25?
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(true))
+ } else {
+ CommandManager.sendTuyaDp(deviceInstance, "1".createCommand(false))
+ }
+ }
+
+ modeRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+ when (checkedId) {
+ R.id.autoRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("1"))
+ }
+ R.id.pointRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("2"))
+ }
+ R.id.edgeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("4"))
+ }
+ R.id.rechargeRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "27".createCommand("5"))
+ }
+ R.id.cycleRadioButton -> {
+ CommandManager.sendTuyaDp(deviceInstance, "34".createCommand(true))
+ }
+ }
+ }
+
timeConfigLayout.setOnClickListener {
"此功能待后续完善".show(context)
}
diff --git a/app/src/main/res/drawable/selector_robot_auto.xml b/app/src/main/res/drawable/selector_robot_auto.xml
new file mode 100644
index 0000000..891bc8c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_auto.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_cycle.xml b/app/src/main/res/drawable/selector_robot_cycle.xml
new file mode 100644
index 0000000..0c2f319
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_cycle.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_edge.xml b/app/src/main/res/drawable/selector_robot_edge.xml
new file mode 100644
index 0000000..9a1d228
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_edge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_point.xml b/app/src/main/res/drawable/selector_robot_point.xml
new file mode 100644
index 0000000..e0b062d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_point.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_robot_recharge.xml b/app/src/main/res/drawable/selector_robot_recharge.xml
new file mode 100644
index 0000000..bc525b2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_robot_recharge.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_sweeping_robot.xml b/app/src/main/res/layout/activity_sweeping_robot.xml
index 0d4c480..3eae65e 100644
--- a/app/src/main/res/layout/activity_sweeping_robot.xml
+++ b/app/src/main/res/layout/activity_sweeping_robot.xml
@@ -151,6 +151,7 @@
android:textSize="@dimen/sp_14" />
@@ -173,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_point"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="定点清扫" />
@@ -184,7 +185,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_edge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="沿边打扫" />
@@ -195,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="自动回充" />
@@ -206,7 +207,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:button="@null"
- android:drawableTop="@drawable/selector_air_cleaner_low"
+ android:drawableTop="@drawable/selector_robot_cycle"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="寻回" />
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto.png b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
new file mode 100644
index 0000000..3e0f98d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
new file mode 100644
index 0000000..9a31ed8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_auto_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
new file mode 100644
index 0000000..65c7bd3
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
new file mode 100644
index 0000000..c8b861e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_cycle_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge.png b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
new file mode 100644
index 0000000..3de90c6
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
new file mode 100644
index 0000000..bbf1cf8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_edge_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point.png b/app/src/main/res/mipmap-xxhdpi/robot_point.png
new file mode 100644
index 0000000..2f808c8
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_point_main.png b/app/src/main/res/mipmap-xxhdpi/robot_point_main.png
new file mode 100644
index 0000000..b3b4e58
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_point_main.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_recharge.png b/app/src/main/res/mipmap-xxhdpi/robot_recharge.png
new file mode 100644
index 0000000..a124228
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_recharge.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/robot_recharge_main.png b/app/src/main/res/mipmap-xxhdpi/robot_recharge_main.png
new file mode 100644
index 0000000..9329ca4
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/robot_recharge_main.png
Binary files differ