littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-03 17:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复：远程查通话和远程查短信关键字搜索时分页bug

Browse Source
This commit is contained in:
pppscn 2022-07-29 15:10:12 +08:00
parent b9617e0978
commit 14e5771293
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/idormy/sms/forwarder/fragment/client/CallQueryFragment.kt
View File

@ -134,7 +134,6 @@ class CallQueryFragment : BaseFragment<FragmentClientCallQueryBinding?>() {
binding!!.tabBar.setOnTabClickListener { _, position -> binding!!.tabBar.setOnTabClickListener { _, position ->
//XToastUtils.toast("点击了$title--$position") //XToastUtils.toast("点击了$title--$position")
callType = 3 - position callType = 3 - position
pageNum = 1
loadRemoteData(true) loadRemoteData(true)
binding!!.recyclerView.scrollToPosition(0) binding!!.recyclerView.scrollToPosition(0)
} }
@ -180,7 +179,6 @@ class CallQueryFragment : BaseFragment<FragmentClientCallQueryBinding?>() {
//下拉刷新 //下拉刷新
binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout -> binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout ->
refreshLayout.layout.postDelayed({ refreshLayout.layout.postDelayed({
pageNum = 1
loadRemoteData(true) loadRemoteData(true)
}, 1000) }, 1000)
} }
@ -206,11 +204,7 @@ class CallQueryFragment : BaseFragment<FragmentClientCallQueryBinding?>() {
msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString()) msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString())
} }
/*val dataMap: MutableMap<String, Any> = mutableMapOf() if (refresh) pageNum = 1
dataMap["type"] = callType
dataMap["page_num"] = pageNum
dataMap["page_size"] = pageSize
msgMap["data"] = dataMap*/
msgMap["data"] = CallQueryData(callType, pageNum, pageSize, keyword) msgMap["data"] = CallQueryData(callType, pageNum, pageSize, keyword)
val requestMsg: String = Gson().toJson(msgMap) val requestMsg: String = Gson().toJson(msgMap)
@ -221,9 +215,6 @@ class CallQueryFragment : BaseFragment<FragmentClientCallQueryBinding?>() {
.keepJson(true) .keepJson(true)
.timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s .timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s
.cacheMode(CacheMode.NO_CACHE) .cacheMode(CacheMode.NO_CACHE)
//.retryCount(SettingUtils.requestRetryTimes) //超时重试的次数
//.retryDelay(SettingUtils.requestDelayTime) //超时重试的延迟时间
//.retryIncreaseDelay(SettingUtils.requestDelayTime) //超时重试叠加延时
.timeStamp(true) .timeStamp(true)
.execute(object : SimpleCallBack<String>() { .execute(object : SimpleCallBack<String>() {

12
app/src/main/java/com/idormy/sms/forwarder/fragment/client/SmsQueryFragment.kt
View File

@ -124,7 +124,6 @@ class SmsQueryFragment : BaseFragment<FragmentClientSmsQueryBinding?>() {
binding!!.tabBar.setOnTabClickListener { _, position -> binding!!.tabBar.setOnTabClickListener { _, position ->
//XToastUtils.toast("点击了$title--$position") //XToastUtils.toast("点击了$title--$position")
smsType = position + 1 smsType = position + 1
pageNum = 1
loadRemoteData(true) loadRemoteData(true)
binding!!.recyclerView.scrollToPosition(0) binding!!.recyclerView.scrollToPosition(0)
} }
@ -170,7 +169,6 @@ class SmsQueryFragment : BaseFragment<FragmentClientSmsQueryBinding?>() {
//下拉刷新 //下拉刷新
binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout -> binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout ->
refreshLayout.layout.postDelayed({ refreshLayout.layout.postDelayed({
pageNum = 1
loadRemoteData(true) loadRemoteData(true)
}, 1000) }, 1000)
} }
@ -196,12 +194,7 @@ class SmsQueryFragment : BaseFragment<FragmentClientSmsQueryBinding?>() {
msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString()) msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString())
} }
/*val dataMap: MutableMap<String, Any> = mutableMapOf() if (refresh) pageNum = 1
dataMap["type"] = smsType
dataMap["page_num"] = pageNum
dataMap["page_size"] = pageSize
dataMap["keyword"] = keyword
msgMap["data"] = dataMap*/
msgMap["data"] = SmsQueryData(smsType, pageNum, pageSize, keyword) msgMap["data"] = SmsQueryData(smsType, pageNum, pageSize, keyword)
val requestMsg: String = Gson().toJson(msgMap) val requestMsg: String = Gson().toJson(msgMap)
@ -212,9 +205,6 @@ class SmsQueryFragment : BaseFragment<FragmentClientSmsQueryBinding?>() {
.keepJson(true) .keepJson(true)
.timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s .timeOut((SettingUtils.requestTimeout * 1000).toLong()) //超时时间10s
.cacheMode(CacheMode.NO_CACHE) .cacheMode(CacheMode.NO_CACHE)
//.retryCount(SettingUtils.requestRetryTimes) //超时重试的次数
//.retryDelay(SettingUtils.requestDelayTime) //超时重试的延迟时间
//.retryIncreaseDelay(SettingUtils.requestDelayTime) //超时重试叠加延时
.timeStamp(true) .timeStamp(true)
.execute(object : SimpleCallBack<String>() { .execute(object : SimpleCallBack<String>() {