From 14e57712935bf193a04a1a3bceec4f11443e2336 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Fri, 29 Jul 2022 15:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A`=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E6=9F=A5=E9=80=9A=E8=AF=9D`=E5=92=8C`=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E6=9F=A5=E7=9F=AD=E4=BF=A1`=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E5=88=86=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/fragment/client/CallQueryFragment.kt   | 11 +----------
 .../forwarder/fragment/client/SmsQueryFragment.kt    | 12 +-----------
 2 files changed, 2 insertions(+), 21 deletions(-)

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<FragmentClientCallQueryBinding?>() {
         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<FragmentClientCallQueryBinding?>() {
         //下拉刷新
         binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout ->
             refreshLayout.layout.postDelayed({
-                pageNum = 1
                 loadRemoteData(true)
             }, 1000)
         }
@@ -206,11 +204,7 @@ class CallQueryFragment : BaseFragment<FragmentClientCallQueryBinding?>() {
             msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString())
         }
 
-        /*val dataMap: MutableMap<String, Any> = 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<FragmentClientCallQueryBinding?>() {
             .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<String>() {
 
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<FragmentClientSmsQueryBinding?>() {
         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<FragmentClientSmsQueryBinding?>() {
         //下拉刷新
         binding!!.refreshLayout.setOnRefreshListener { refreshLayout: RefreshLayout ->
             refreshLayout.layout.postDelayed({
-                pageNum = 1
                 loadRemoteData(true)
             }, 1000)
         }
@@ -196,12 +194,7 @@ class SmsQueryFragment : BaseFragment<FragmentClientSmsQueryBinding?>() {
             msgMap["sign"] = HttpServerUtils.calcSign(timestamp.toString(), clientSignKey.toString())
         }
 
-        /*val dataMap: MutableMap<String, Any> = 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<FragmentClientSmsQueryBinding?>() {
             .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<String>() {