|
|
@@ -16,6 +16,7 @@ import com.yingyangfly.baselib.router.RouterUrlCommon
|
|
|
import com.yingyangfly.baselib.utils.JumpUtil
|
|
|
import com.yingyangfly.baselib.utils.RxBusCodes
|
|
|
import com.yingyangfly.baselib.utils.RxTimer
|
|
|
+import com.yingyangfly.baselib.utils.User
|
|
|
import gorden.rxbus2.Subscribe
|
|
|
import gorden.rxbus2.ThreadMode
|
|
|
import kotlinx.coroutines.Dispatchers
|
|
|
@@ -28,8 +29,7 @@ import java.util.*
|
|
|
* moca试题库
|
|
|
*/
|
|
|
@Route(path = RouterUrlCommon.mocaEvaluation)
|
|
|
-class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
|
|
|
- View.OnTouchListener {
|
|
|
+class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(), View.OnTouchListener {
|
|
|
|
|
|
private var reviewTaskId = ""
|
|
|
private lateinit var rxTimer: RxTimer
|
|
|
@@ -58,6 +58,11 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ override fun onResume() {
|
|
|
+ super.onResume()
|
|
|
+ reportLog("进入moca测评页面")
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 结束答题
|
|
|
*/
|
|
|
@@ -102,12 +107,14 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
|
|
|
v.startAnimation(getScaleAnimation())
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
MotionEvent.ACTION_UP -> {
|
|
|
v.startAnimation(getEndAnimation())
|
|
|
if (v.id == R.id.layoutHead) {
|
|
|
showTipsDialog()
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
MotionEvent.ACTION_CANCEL -> {
|
|
|
if (v.id == R.id.layoutHead) {
|
|
|
v.startAnimation(getEndAnimation())
|
|
|
@@ -121,16 +128,24 @@ class MocaActivity : BaseMVVMActivity<ActivityMocaBinding, MocaViewModel>(),
|
|
|
* 退出确认弹窗
|
|
|
*/
|
|
|
private fun showTipsDialog() {
|
|
|
- TipsDialog.TipDialogBuilder()
|
|
|
- .title("提示")
|
|
|
- .content("您确定取消测评?")
|
|
|
- .leftBtnText("取消")
|
|
|
- .rightBtnText("确定")
|
|
|
- .leftClick({
|
|
|
- }, true)
|
|
|
- .rightClick({
|
|
|
+ TipsDialog.TipDialogBuilder().title("提示").content("您确定取消测评?").leftBtnText("取消")
|
|
|
+ .rightBtnText("确定").leftClick({}, true).rightClick({
|
|
|
finish()
|
|
|
- }, true)
|
|
|
- .show(supportFragmentManager)
|
|
|
+ }, true).show(supportFragmentManager)
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 阿里云日志上报
|
|
|
+ */
|
|
|
+ private fun reportLog(msg: String) {
|
|
|
+ runOnUiThread {
|
|
|
+ val log = com.aliyun.sls.android.producer.Log()
|
|
|
+ log.putContent(
|
|
|
+ "moca测评页面日志", msg
|
|
|
+ )
|
|
|
+ log.putContent("患者id", User.getUserId())
|
|
|
+ log.putContent("患者姓名", User.getName())
|
|
|
+ sendLog(log)
|
|
|
+ }
|
|
|
}
|
|
|
}
|