xiongzhu 1 год назад
Родитель
Сommit
cb68b48010

+ 1 - 1
app/build.gradle

@@ -24,7 +24,7 @@ android {
         applicationId "com.example.modifier"
         minSdk 29
         targetSdk 34
-        versionCode 142
+        versionCode 143
         versionName "1.0.1"
         archivesBaseName = "modifier-${versionCode}"
 

+ 4 - 2
app/src/main/java/com/example/modifier/http/api/RcsNumberApi.kt

@@ -50,12 +50,14 @@ class RcsNumberApi() {
         suspend fun getRcsNumber(
             deviceId: String,
             taskId: Int? = null,
-            pinCountry: String?
+            pinCountry: String?,
+            store: Boolean? = false
         ): RcsNumberResponse {
             val req = RcsNumberRequest(
                 deviceId = deviceId,
                 taskId = taskId,
-                country = pinCountry
+                country = pinCountry,
+                store = store
             )
             val response = ktorClient.put(RcsNumberApi()) {
                 contentType(ContentType.Application.Json)

+ 2 - 1
app/src/main/java/com/example/modifier/http/request/RcsNumberRequest.kt

@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
 data class RcsNumberRequest(
     var deviceId: String,
     var taskId: Int? = null,
-    var country: String? = null
+    var country: String? = null,
+    var store: Boolean? = false
 )

+ 5 - 4
app/src/main/java/com/example/modifier/service/TaskRunner.kt

@@ -359,14 +359,15 @@ class TaskRunner(
         appStateRepo.updateRuntimeFlags(reqState = ReqState.NONE)
     }
 
-    suspend fun requestNumberAtomic() {
+    private suspend fun requestNumberAtomic(store: Boolean? = false) {
         appStateRepo.updateRuntimeFlags(reqState = ReqState.REQUEST)
         gmsgStateRepository.updateRcsState(RcsConfigureState.NOT_CONFIGURED)
         val device = DeviceApi.getDevice(appPrefsRepo.appPrefs.value.id)
         val rcsNumber = RcsNumberApi.getRcsNumber(
-            appPrefsRepo.appPrefs.value.id,
-            currentTaskId,
-            device.pinCountry
+            deviceId = appPrefsRepo.appPrefs.value.id,
+            taskId = currentTaskId,
+            pinCountry = device.pinCountry,
+            store = store
         )
         Log.i(TAG, "requestNumber response: $rcsNumber")