diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
+
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
+
-
+
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
+
-
+
-
+
+
+
+
+
+
+
diff --git a/app/src/main/assets/HelpCenterH5.html b/app/src/main/assets/HelpCenterH5.html
deleted file mode 100644
index f52dc67..0000000
--- a/app/src/main/assets/HelpCenterH5.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
+
-
+
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/single_activity_event_detail.xml b/app/src/main/res/layout/single_activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/single_activity_event_detail.xml
+++ b/app/src/main/res/layout/single_activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
-
-
-
-
-1、如何新建巡检？
- 登录APP进入系统，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。
-2、如何新建事件？
- 当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。
-3、如何连接设备？
- 首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。
-4、地图无法正常显示怎么办？
- 如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。
-5、应用所需的其他权限？
- 获取手机信息(IMEI)的权限,为安全访问网络，此项请务必允许。
-
-
\ No newline at end of file
diff --git a/app/src/main/assets/QuestionAndAnswer.json b/app/src/main/assets/QuestionAndAnswer.json
new file mode 100644
index 0000000..08e5c1a
--- /dev/null
+++ b/app/src/main/assets/QuestionAndAnswer.json
@@ -0,0 +1,22 @@
+[
+ {
+ "question": "1、如何新建巡检？",
+ "answer": "点击”登录“或者”本地模式“进入APP，首页地图左边四个按钮第四个按钮即为新建巡检按钮，按照弹出对话框提示即可新建巡检任务，然后就可以手持巡检设备开始进行检测作业。"
+ },
+ {
+ "question": "2、如何新建事件？",
+ "answer": "当巡检到异常之后，可以点击【新建事件】来记录此时此地的巡检数据，巡检结束后可以直接在【数据】页查看当时的异常数据或者在巡检系统看到原始数据。"
+ },
+ {
+ "question": "3、如何连接设备？",
+ "answer": "首先确认手机蓝牙已打开，然后点击首页地图左边第二个按钮开始扫描附近可用的蓝牙设备，一段时间后点击扫描出来的需要连接的设备进行连接即可。"
+ },
+ {
+ "question": "4、地图无法正常显示怎么办？",
+ "answer": "如果地图短时间呈现网格状，可能是网络信号不好，加载矢量地图需要一定的流量。如果地图一直呈现网格状，请直接联系客服或者管理员处理。"
+ },
+ {
+ "question": "5、应用所需的其他权限？",
+ "answer": "获取手机信息(IMEI)的权限，为安全访问网络，此项请务必允许。"
+ }
+]
diff --git a/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
new file mode 100644
index 0000000..a52aba8
--- /dev/null
+++ b/app/src/main/java/com/casic/birmm/inspect/model/QuestionAnAnswerModel.java
@@ -0,0 +1,22 @@
+package com.casic.birmm.inspect.model;
+
+public class QuestionAnAnswerModel {
+ private String question;
+ private String answer;
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+}
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
index 2b69e33..26de0c5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityEventDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.view.BigImageActivity
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -63,7 +63,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityEventDetailBinding {
@@ -75,8 +75,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false).statusBarColor(R.color.themeColor).init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
index e3fa099..16336eb 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionEventActivity.kt
@@ -4,9 +4,8 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.bean.TaskEventLocalBean
import com.casic.birmm.inspect.databinding.SingleActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -15,6 +14,7 @@
import com.pengxh.kt.lite.extensions.toJson
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -68,7 +68,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun initViewBinding(): SingleActivityInspectionEventBinding {
@@ -80,11 +80,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
index f102943..b4e47e6 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/InspectionRouteActivity.kt
@@ -12,13 +12,13 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.utils.DataBaseManager
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -74,7 +74,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
@@ -85,12 +84,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
index 60d5096..cc894a1 100644
--- a/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/single/view/NewEventActivity.kt
@@ -6,12 +6,11 @@
import android.view.View
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.SingleActivityNewEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.DataBaseManager
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.view.BigImageActivity
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -25,6 +24,7 @@
import com.pengxh.kt.lite.extensions.timestampToCompleteDate
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.util.UUID
@@ -60,10 +60,10 @@
latitude = args[5].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -75,8 +75,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -205,10 +203,15 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 577f94d..ec0ced5 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -4,17 +4,17 @@
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityEventDetailBinding
import com.casic.birmm.inspect.extensions.combineImagePath
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.EventListModel
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.extensions.show
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
+import com.pengxh.kt.lite.widget.TitleBarView
class EventDetailActivity : KotlinBaseActivity() {
@@ -25,12 +25,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件详情"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun observeRequestState() {
@@ -80,6 +84,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
index 23769e7..4f1bfd0 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/HelpCenterActivity.kt
@@ -1,38 +1,72 @@
package com.casic.birmm.inspect.view
+import android.graphics.Color
import android.os.Bundle
-import android.view.View
-import android.webkit.WebViewClient
+import android.widget.TextView
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityHelpCenterBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
-import com.gyf.immersionbar.ImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
+import com.casic.birmm.inspect.model.QuestionAnAnswerModel
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
+import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
+import com.pengxh.kt.lite.divider.RecyclerViewItemDivider
+import com.pengxh.kt.lite.extensions.readAssetsFile
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.utils.HtmlRenderEngine
+import com.pengxh.kt.lite.widget.TitleBarView
class HelpCenterActivity : KotlinBaseActivity() {
+
+ private val context = this
+ private val gson by lazy { Gson() }
+
override fun initViewBinding(): ActivityHelpCenterBinding {
return ActivityHelpCenterBinding.inflate(layoutInflater)
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "帮助中心"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
ActivityStackManager.addActivity(this)
- binding.answerView.loadUrl("file:///android_asset/HelpCenterH5.html")
- binding.answerView.settings.defaultTextEncodingName = "utf-8"
- binding.answerView.webViewClient = WebViewClient()
+ val assetsFile = readAssetsFile("QuestionAndAnswer.json")
+ val dataRows = gson.fromJson>(
+ assetsFile, object : TypeToken>() {}.type
+ )
+ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.LTGRAY))
+ binding.recyclerView.adapter = object :
+ NormalRecyclerAdapter(R.layout.item_help_rv_l, dataRows) {
+ override fun convertView(
+ viewHolder: ViewHolder, position: Int, item: QuestionAnAnswerModel
+ ) {
+ viewHolder.setText(R.id.questionView, item.question)
+ val textView = viewHolder.getView(R.id.answerView)
+ HtmlRenderEngine.Builder()
+ .setContext(context)
+ .setHtmlContent(item.answer)
+ .setTargetView(textView)
+ .setOnGetImageSourceListener(object :
+ HtmlRenderEngine.OnGetImageSourceListener {
+ override fun imageSource(url: String) {
+
+ }
+ }).build().load()
+ }
+ }
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
index c498c6b..d861f61 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionEventActivity.kt
@@ -4,10 +4,9 @@
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionEventBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.model.InspectEventModel
import com.casic.birmm.inspect.vm.InspectionViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter
import com.pengxh.kt.lite.adapter.ViewHolder
import com.pengxh.kt.lite.base.KotlinBaseActivity
@@ -18,6 +17,7 @@
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionEventActivity : KotlinBaseActivity() {
@@ -28,12 +28,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "事件清单"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -91,7 +95,7 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+
}
override fun observeRequestState() {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
index d470719..d851016 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/InspectionRouteActivity.kt
@@ -13,16 +13,16 @@
import com.amap.api.maps.model.PolylineOptions
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityInspectionRouteBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.InspectionViewModel
import com.casic.birmm.inspect.vm.RouteViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.extensions.navigatePageTo
import com.pengxh.kt.lite.utils.ActivityStackManager
import com.pengxh.kt.lite.utils.Constant
import com.pengxh.kt.lite.utils.LoadState
import com.pengxh.kt.lite.utils.LoadingDialogHub
+import com.pengxh.kt.lite.widget.TitleBarView
class InspectionRouteActivity : KotlinBaseActivity() {
@@ -36,12 +36,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
- binding.titleInclude.titleView.text = "巡检记录"
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
@@ -98,7 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
binding.eventButton.setOnClickListener {
navigatePageTo(inspectionId)
}
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
index 844fa20..10fdbd4 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/NewEventActivity.kt
@@ -14,13 +14,12 @@
import com.casic.birmm.inspect.databinding.ActivityNewEventBinding
import com.casic.birmm.inspect.extensions.combineImagePath
import com.casic.birmm.inspect.extensions.compressImage
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.extensions.reformat
import com.casic.birmm.inspect.utils.GlideLoadEngine
import com.casic.birmm.inspect.utils.LocaleConstant
import com.casic.birmm.inspect.vm.EventViewModel
import com.casic.birmm.inspect.vm.UploadImageViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.luck.picture.lib.basic.PictureSelector
import com.luck.picture.lib.config.SelectMimeType
import com.luck.picture.lib.entity.LocalMedia
@@ -38,6 +37,7 @@
import com.pengxh.kt.lite.utils.LoadingDialogHub
import com.pengxh.kt.lite.utils.SaveKeyValues
import com.pengxh.kt.lite.utils.WeakReferenceHandler
+import com.pengxh.kt.lite.widget.TitleBarView
import com.pengxh.kt.lite.widget.dialog.BottomActionSheet
import java.io.File
import java.util.UUID
@@ -87,10 +87,10 @@
latitude = args[4].toDouble()
if (isWarning) {
- binding.titleInclude.titleView.text = "报警事件记录"
+ binding.titleView.setTitle("报警事件记录")
binding.inspectCardView.visibility = View.VISIBLE
} else {
- binding.titleInclude.titleView.text = "自定义事件记录"
+ binding.titleView.setTitle("自定义事件记录")
binding.inspectCardView.visibility = View.GONE
}
binding.createTimeView.text = System.currentTimeMillis().timestampToCompleteDate()
@@ -102,8 +102,6 @@
}
override fun initEvent() {
- binding.titleInclude.leftBackView.setOnClickListener { this.finish() }
-
imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener {
override fun onAddImageClick() {
BottomActionSheet.Builder()
@@ -278,11 +276,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
+
+ override fun onRightClick() {
+
+ }
+ })
}
override fun handleMessage(msg: Message): Boolean {
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
index 874257c..efd6617 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/UserDetailActivity.kt
@@ -1,15 +1,14 @@
package com.casic.birmm.inspect.view
import android.os.Bundle
-import android.view.View
import androidx.lifecycle.ViewModelProvider
import com.casic.birmm.inspect.R
import com.casic.birmm.inspect.databinding.ActivityUserDetailBinding
-import com.casic.birmm.inspect.extensions.initLayoutImmersionBar
+import com.casic.birmm.inspect.extensions.initImmersionBar
import com.casic.birmm.inspect.vm.UserViewModel
-import com.gyf.immersionbar.ImmersionBar
import com.pengxh.kt.lite.base.KotlinBaseActivity
import com.pengxh.kt.lite.utils.ActivityStackManager
+import com.pengxh.kt.lite.widget.TitleBarView
class UserDetailActivity : KotlinBaseActivity() {
@@ -20,15 +19,16 @@
}
override fun setupTopBarLayout() {
- ImmersionBar.with(this)
- .statusBarDarkFont(false)
- .statusBarColor(R.color.themeColor)
- .init()
- initLayoutImmersionBar(binding.rootView)
+ binding.rootView.initImmersionBar(this, false, R.color.themeColor)
+ binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+ override fun onLeftClick() {
+ finish()
+ }
- binding.titleInclude.titleView.text = "个人资料"
- binding.titleInclude.leftBackView.visibility = View.VISIBLE
- binding.titleInclude.leftBackView.setOnClickListener { finish() }
+ override fun onRightClick() {
+
+ }
+ })
}
override fun initOnCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml
index c32af14..d8dc39e 100644
--- a/app/src/main/res/layout/activity_event_detail.xml
+++ b/app/src/main/res/layout/activity_event_detail.xml
@@ -1,14 +1,24 @@
-
+
-
-
-
+ android:layout_height="wrap_content"
+ android:background="@color/themeColor"
+ app:tbv_left_image="@drawable/ic_title_left"
+ app:tbv_only_show_title="false"
+ app:tbv_show_left_image="true"
+ app:tbv_show_right_image="false"
+ app:tbv_text="帮助中心"
+ app:tbv_text_color="@color/white"
+ app:tbv_text_size="@dimen/sp_16" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_inspection_event.xml b/app/src/main/res/layout/activity_inspection_event.xml
index c3a810a..5bc27f3 100644
--- a/app/src/main/res/layout/activity_inspection_event.xml
+++ b/app/src/main/res/layout/activity_inspection_event.xml
@@ -7,9 +7,18 @@
android:background="@color/mainBackground"
android:orientation="vertical">
-
+
-
+
-
+