fix（retrofit）：增大支付超时时长

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.doverfuelingsolutions.issp"
         minSdkVersion 22
         targetSdkVersion 26
-        versionCode 17
-        versionName "1.2.04"
+        versionCode 18
+        versionName "1.2.05"
         archivesBaseName = versionName + "." + getTime()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/doverfuelingsolutions/issp/api/WayneApiConfig.kt

@@ -9,7 +9,12 @@ class WayneApiConfig {
 
         const val timeoutConnect = 120L
         const val timeoutAll = 25L //超时时间由原本的 180 秒改为 20 秒
-        const val timeoutPay = 60L //支付的超时时间长一点，有时是等待输入密码导致响应时间比较长
+
+        //支付的超时时间长一点，有时是等待输入密码导致响应时间比较长
+        //设置不同的时间，后面方便从不同的时间来判断是哪个时间超时
+        const val timeoutPayCall = 70L  //超时时间
+        const val timeoutPayWrite = 60L //写超时
+        const val timeoutPayRead = 65L  //读超时
 
         const val PATH_BASE_TOKEN = "token"
         const val PATH_BASE_DEVICE_SESSION = "api/DeviceManagement/GetCurrentSessionInfo"
@@ -29,6 +34,7 @@ class WayneApiConfig {
 
         // 默认值 - 云端
         const val DOMAIN_DEFAULT = "http://ipos.biz"
+        const val DOMAIN_DEFAULT_RELEASE = "http://tkhs.net.cn"
         const val PORT_BASE_DEFAULT = "8698"
         const val PORT_TRX_DEFAULT = "8699"
         const val PORT_CONFIG_DEFAULT = "8889"

app/src/main/java/com/doverfuelingsolutions/issp/api/basic/RetrofitUtil.kt

@@ -31,9 +31,9 @@ object RetrofitUtil {
         .addInterceptor(loggingInterceptor)
     private val payHttpBuilder = OkHttpClient.Builder()
         .connectTimeout(WayneApiConfig.timeoutConnect, TimeUnit.SECONDS)
-        .readTimeout(WayneApiConfig.timeoutAll, TimeUnit.SECONDS)
-        .writeTimeout(WayneApiConfig.timeoutAll, TimeUnit.SECONDS)
-        .callTimeout(WayneApiConfig.timeoutPay, TimeUnit.SECONDS)
+        .readTimeout(WayneApiConfig.timeoutPayRead, TimeUnit.SECONDS)
+        .writeTimeout(WayneApiConfig.timeoutPayWrite, TimeUnit.SECONDS)
+        .callTimeout(WayneApiConfig.timeoutPayCall, TimeUnit.SECONDS)
         .connectionPool(connectionPool)
         .addInterceptor(authInterceptor)
         .addInterceptor(loggingInterceptor)

app/src/main/java/com/doverfuelingsolutions/issp/utils/sp/SPUtil.kt

@@ -110,7 +110,7 @@ object SPUtil {
             putString(SPKeys.SN, DeviceUtil.generateSerialNumber())
 
             //添加升级服务信息
-            putString(SPKeys.UPDATEL_IP, WayneApiConfig.DOMAIN_DEFAULT)
+            putString(SPKeys.UPDATEL_IP, WayneApiConfig.DOMAIN_DEFAULT_RELEASE)
             putString(SPKeys.UPDATE_PORT, WayneApiConfig.PORT_ASSETS_DEFAULT)
             commit()
         }