diff --git a/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt b/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt index b0d8d41..74bb6f2 100644 --- a/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt +++ b/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt @@ -42,7 +42,7 @@ class ListenActivity : AppCompatActivity() { initView() initAccessibility() initOverlays() - HttpUtil.checkUpdate() + initData() PermissionUtils.permission("android.permission.READ_EXTERNAL_STORAGE").request() registerReceiver(openWsReceiver, IntentFilter(Constant.WEWORK_NOTIFY)) } @@ -74,6 +74,7 @@ class ListenActivity : AppCompatActivity() { sendBroadcast(Intent(Constant.WEWORK_NOTIFY).apply { putExtra("type", "modify_channel") }) + HttpUtil.getMyConfig(toast = false) MobclickAgent.onProfileSignIn(channel) } tv_host.text = Constant.host @@ -154,6 +155,11 @@ class ListenActivity : AppCompatActivity() { } } + private fun initData() { + HttpUtil.checkUpdate() + HttpUtil.getMyConfig(toast = false) + } + private fun showSelectHostDialog() { val hostList = SPUtils.getInstance().getStringSet("host_list", mutableSetOf(Constant.host)) if (hostList.isNotEmpty()) { diff --git a/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt b/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt index 3ae6657..b1970ff 100644 --- a/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/AccessibilityUtil.kt @@ -170,6 +170,10 @@ object AccessibilityUtil { } else { textChanged = true LogUtils.v("未滚动到顶部 $index") + if (listener != null && listener.onScroll()) { + LogUtils.d("提前终止滚动") + return true + } } } if (tryUseGesture) { diff --git a/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt index 17ee350..a54bf58 100644 --- a/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt @@ -63,9 +63,11 @@ object HttpUtil { }) } - fun getMyConfig() { + fun getMyConfig(toast: Boolean = true) { if (Constant.robotId.isBlank()) { - ToastUtils.showLong("请先填写机器人ID") + if (toast) { + ToastUtils.showLong("请先填写机器人ID") + } return } OkGo.get(Constant.getMyConfig())