diff --git a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
index 0634e67..85dae02 100644
--- a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
@@ -35,7 +35,7 @@
private var isPause = false
override fun initEvent() {
-
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
index 0634e67..85dae02 100644
--- a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
@@ -35,7 +35,7 @@
private var isPause = false
override fun initEvent() {
-
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index 4b03815..44e2a29 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -122,6 +122,8 @@
page++
getTaskRouteByPage()
}
+
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
index 0634e67..85dae02 100644
--- a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
@@ -35,7 +35,7 @@
private var isPause = false
override fun initEvent() {
-
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index 4b03815..44e2a29 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -122,6 +122,8 @@
page++
getTaskRouteByPage()
}
+
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/drawable/ic_return.xml b/app/src/main/res/drawable/ic_return.xml
new file mode 100644
index 0000000..d927c2e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_return.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
index 0634e67..85dae02 100644
--- a/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/AlarmDetailActivity.kt
@@ -35,7 +35,7 @@
private var isPause = false
override fun initEvent() {
-
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
index 4b03815..44e2a29 100644
--- a/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
+++ b/app/src/main/java/com/casic/br/ktd/view/TaskDetailActivity.kt
@@ -122,6 +122,8 @@
page++
getTaskRouteByPage()
}
+
+ binding.returnButton.setOnClickListener { finish() }
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/drawable/ic_return.xml b/app/src/main/res/drawable/ic_return.xml
new file mode 100644
index 0000000..d927c2e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_return.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml
index b5d2519..e24a9b0 100644
--- a/app/src/main/res/layout/activity_alarm_detail.xml
+++ b/app/src/main/res/layout/activity_alarm_detail.xml
@@ -200,7 +200,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_5"
+ android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="1"
android:orientation="vertical">
@@ -217,14 +217,33 @@
android:layout_height="@dimen/dp_35"
android:background="@drawable/task_fgmt_line" />
-
+ android:layout_weight="1">
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_alarm_detail.xml b/app/src/main/res/layout/activity_alarm_detail.xml
index b5d2519..e24a9b0 100644
--- a/app/src/main/res/layout/activity_alarm_detail.xml
+++ b/app/src/main/res/layout/activity_alarm_detail.xml
@@ -200,7 +200,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_5"
+ android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_10"
android:layout_weight="1"
android:orientation="vertical">
@@ -217,14 +217,33 @@
android:layout_height="@dimen/dp_35"
android:background="@drawable/task_fgmt_line" />
-
+ android:layout_weight="1">
+
+
+
+
+
-
+ android:background="@color/backgroundColor">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
+
-
+ android:layout_height="@dimen/dp_55"
+ android:background="@color/white"
+ app:cardCornerRadius="@dimen/dp_7"
+ app:cardElevation="@dimen/dp_2"
+ app:cardUseCompatPadding="true">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:orientation="horizontal">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:text="重置条件"
+ android:textColor="@color/themeColor"
+ android:textSize="@dimen/sp_18"
+ android:textStyle="bold" />
+
-
-
+ android:background="@color/backgroundColor">
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file