|
|
@@ -158,6 +158,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
|
|
|
Glide.with(this@HomeActivity).asGif().load(R.drawable.fish).into(fishImage)
|
|
|
}
|
|
|
LiveEventBusUtil.send(RxBusCodes.FINISHGAME, "")
|
|
|
+ reportLog("跳转home页")
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -191,13 +192,16 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
|
|
|
* 获取任务相关接口
|
|
|
*/
|
|
|
private fun launchTask() {
|
|
|
- //获取任务列表
|
|
|
- getFindMyTask()
|
|
|
- if (TextUtils.equals("0", User.getFirstLogin())) {
|
|
|
- //第一次登录弹窗欢迎
|
|
|
- User.saveFirstLogin("1")
|
|
|
- binding.tvPlayPorpoise.post {
|
|
|
- showPlayPorpoiseView()
|
|
|
+ runOnUiThread {
|
|
|
+ //获取任务列表
|
|
|
+ getFindMyTask()
|
|
|
+ if (TextUtils.equals("0", User.getFirstLogin())) {
|
|
|
+ reportLog("首次登录展示引导页")
|
|
|
+ //第一次登录弹窗欢迎
|
|
|
+ User.saveFirstLogin("1")
|
|
|
+ binding.tvPlayPorpoise.post {
|
|
|
+ showPlayPorpoiseView()
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -235,64 +239,60 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
|
|
|
* 查询是否有进行中的任务
|
|
|
*/
|
|
|
private fun getFindMyTask() {
|
|
|
- runOnUiThread {
|
|
|
- viewModel.findMyCurrentTask(fail = {
|
|
|
- "获取任务列表失败".toast()
|
|
|
- }, success = {
|
|
|
- if (it.isNullOrEmpty().not()) {
|
|
|
- showLayout(false)
|
|
|
- it!![0].let {
|
|
|
- binding.task = it
|
|
|
- if (it.details.isNullOrEmpty().not()) {
|
|
|
- val index = it.currentTaskNum - 1
|
|
|
- currentTaskRecord = it.details[index]
|
|
|
- taskList.addAll(it.details)
|
|
|
- }
|
|
|
- if (it.currentTaskNum == it.totalTaskNum) {
|
|
|
- if (TextUtils.equals("0", it.status)) {
|
|
|
- //任务完成
|
|
|
- if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
|
|
|
- .not()
|
|
|
- ) {
|
|
|
- User.saveTaskDialogStatus(User.getNowDay())
|
|
|
- showTipDialog()
|
|
|
- } else {
|
|
|
- showLayout(true)
|
|
|
- getGameList()
|
|
|
- }
|
|
|
- binding.btnTask.text = "继续专属训练"
|
|
|
+ viewModel.findMyCurrentTask(fail = {
|
|
|
+ "获取任务列表失败".toast()
|
|
|
+ }, success = {
|
|
|
+ if (it.isNullOrEmpty().not()) {
|
|
|
+ showLayout(false)
|
|
|
+ it!![0].let {
|
|
|
+ binding.task = it
|
|
|
+ if (it.details.isNullOrEmpty().not()) {
|
|
|
+ val index = it.currentTaskNum - 1
|
|
|
+ currentTaskRecord = it.details[index]
|
|
|
+ taskList.addAll(it.details)
|
|
|
+ }
|
|
|
+ if (it.currentTaskNum == it.totalTaskNum) {
|
|
|
+ if (TextUtils.equals("0", it.status)) {
|
|
|
+ //任务完成
|
|
|
+ if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
|
|
|
+ .not()
|
|
|
+ ) {
|
|
|
+ User.saveTaskDialogStatus(User.getNowDay())
|
|
|
+ showTipDialog()
|
|
|
} else {
|
|
|
- binding.btnTask.text = if (it.currentTaskNum == 1) {
|
|
|
- "开始专属训练"
|
|
|
- } else {
|
|
|
- "继续专属训练"
|
|
|
- }
|
|
|
- showLayout(false)
|
|
|
- if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
|
|
|
- .not()
|
|
|
- ) {
|
|
|
- User.saveTaskDialogStatus(User.getNowDay())
|
|
|
- }
|
|
|
+ showLayout(true)
|
|
|
+ getGameList()
|
|
|
}
|
|
|
+ binding.btnTask.text = "继续专属训练"
|
|
|
} else {
|
|
|
binding.btnTask.text = if (it.currentTaskNum == 1) {
|
|
|
"开始专属训练"
|
|
|
} else {
|
|
|
"继续专属训练"
|
|
|
}
|
|
|
+ showLayout(false)
|
|
|
if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus())
|
|
|
.not()
|
|
|
) {
|
|
|
User.saveTaskDialogStatus(User.getNowDay())
|
|
|
}
|
|
|
}
|
|
|
+ } else {
|
|
|
+ binding.btnTask.text = if (it.currentTaskNum == 1) {
|
|
|
+ "开始专属训练"
|
|
|
+ } else {
|
|
|
+ "继续专属训练"
|
|
|
+ }
|
|
|
+ if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
|
|
|
+ User.saveTaskDialogStatus(User.getNowDay())
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
- showLayout(true)
|
|
|
- getGameList()
|
|
|
}
|
|
|
- })
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ showLayout(true)
|
|
|
+ getGameList()
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -319,9 +319,9 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
|
|
|
viewModel.getGameList(fail = {
|
|
|
"获取推荐游戏列表失败".toast()
|
|
|
}, success = {
|
|
|
+ gameList.clear()
|
|
|
+ pageList.clear()
|
|
|
if (it.isNullOrEmpty().not()) {
|
|
|
- gameList.clear()
|
|
|
- pageList.clear()
|
|
|
gameList.addAll(it!!)
|
|
|
binding.btnNextPage.show(it.size > 4)
|
|
|
if (it.size > 4) {
|
|
|
@@ -664,17 +664,17 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
|
|
|
*/
|
|
|
private fun makeMessageAsRead(msg: V2TIMMessage) {
|
|
|
runOnUiThread {
|
|
|
- V2TIMManager.getConversationManager()
|
|
|
- .cleanConversationUnreadMessageCount(String.format("c2c_%s", msg.sender),
|
|
|
- 0,
|
|
|
- 0,
|
|
|
- object : V2TIMCallback {
|
|
|
- override fun onSuccess() {
|
|
|
- }
|
|
|
+ V2TIMManager.getConversationManager().cleanConversationUnreadMessageCount(
|
|
|
+ String.format("c2c_%s", msg.sender),
|
|
|
+ 0,
|
|
|
+ 0,
|
|
|
+ object : V2TIMCallback {
|
|
|
+ override fun onSuccess() {
|
|
|
+ }
|
|
|
|
|
|
- override fun onError(p0: Int, p1: String?) {
|
|
|
- }
|
|
|
- })
|
|
|
+ override fun onError(p0: Int, p1: String?) {
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -925,4 +925,19 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>(), Vie
|
|
|
sendLog(log)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 阿里云日志上报
|
|
|
+ */
|
|
|
+ private fun reportLog(msg: String) {
|
|
|
+ runOnUiThread {
|
|
|
+ val log = com.aliyun.sls.android.producer.Log()
|
|
|
+ log.putContent(
|
|
|
+ "首页日志", msg
|
|
|
+ )
|
|
|
+ log.putContent("患者id", User.getUserId())
|
|
|
+ log.putContent("患者姓名", User.getName())
|
|
|
+ sendLog(log)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|