diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt index a4c46a87..7f23502b 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt @@ -134,7 +134,6 @@ class CallQueryFragment : BaseFragment() { binding!!.tabBar.setOnTabClickListener { _, position -> //XToastUtils.toast("点击了$title--$position") callType = 3 - position - pageNum = 1 loadRemoteData(true) binding!!.recyclerView.scrollToPosition(0) } @@ -180,7 +179,6 @@ class CallQueryFragment : BaseFragment() { //下拉刷新 binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout -> refreshLayout.layout.postDelayed({ - pageNum = 1 loadRemoteData(true) }, 1000) } @@ -206,11 +204,7 @@ class CallQueryFragment : BaseFragment() { msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString()) } - /*val dataMap: MutableMap = mutableMapOf() - dataMap["type"] = callType - dataMap["page_num"] = pageNum - dataMap["page_size"] = pageSize - msgMap["data"] = dataMap*/ + if (refresh) pageNum = 1 msgMap["data"] = CallQueryData(callType, pageNum, pageSize, keyword) val requestMsg: String = Gson().toJson(msgMap) @@ -221,9 +215,6 @@ class CallQueryFragment : BaseFragment() { .keepJson(true) .timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s .cacheMode(CacheMode.NO_CACHE) - //.retryCount(SettingUtils.requestRetryTimes) //超时重试的次数 - //.retryDelay(SettingUtils.requestDelayTime) //超时重试的延迟时间 - //.retryIncreaseDelay(SettingUtils.requestDelayTime) //超时重试叠加延时 .timeStamp(true) .execute(object : SimpleCallBack() { diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt index 979310aa..eed73e0a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt @@ -124,7 +124,6 @@ class SmsQueryFragment : BaseFragment() { binding!!.tabBar.setOnTabClickListener { _, position -> //XToastUtils.toast("点击了$title--$position") smsType = position + 1 - pageNum = 1 loadRemoteData(true) binding!!.recyclerView.scrollToPosition(0) } @@ -170,7 +169,6 @@ class SmsQueryFragment : BaseFragment() { //下拉刷新 binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout -> refreshLayout.layout.postDelayed({ - pageNum = 1 loadRemoteData(true) }, 1000) } @@ -196,12 +194,7 @@ class SmsQueryFragment : BaseFragment() { msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString()) } - /*val dataMap: MutableMap = mutableMapOf() - dataMap["type"] = smsType - dataMap["page_num"] = pageNum - dataMap["page_size"] = pageSize - dataMap["keyword"] = keyword - msgMap["data"] = dataMap*/ + if (refresh) pageNum = 1 msgMap["data"] = SmsQueryData(smsType, pageNum, pageSize, keyword) val requestMsg: String = Gson().toJson(msgMap) @@ -212,9 +205,6 @@ class SmsQueryFragment : BaseFragment() { .keepJson(true) .timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s .cacheMode(CacheMode.NO_CACHE) - //.retryCount(SettingUtils.requestRetryTimes) //超时重试的次数 - //.retryDelay(SettingUtils.requestDelayTime) //超时重试的延迟时间 - //.retryIncreaseDelay(SettingUtils.requestDelayTime) //超时重试叠加延时 .timeStamp(true) .execute(object : SimpleCallBack() {