react-native-mytatva-rn-sdk 1.2.52 → 1.2.54

package/android/src/main/java/com/mytatvarnsdk/network/AuthenticateSDKService.kt

@@ -23,207 +23,207 @@ import okhttp3.RequestBody.Companion.toRequestBody
 class AuthenticateSDKService(val scope: CoroutineScope) {
 
 
-  fun postCGMData(
-    environment: TATVA_ENVIRONMENT,
-    data: String,
-    token: String,
-    responseListener: ResponseListener
-  ) {
-    scope.launch {
-      try {
-
-        val apiServiceInterface = RetrofitInstance.getRetroInstance().create(
-          ApiServiceInterface::class.java
-        )
-
-        val encryptionKey = getEncryptionKey(
-          env = TATVA_ENVIRONMENT.PROD,
-          prodEncKey = PROD_ENC_KEY,
-          stagEncKey = STAGE_ENC_KEY
-        )
-
-        val encryptionIv = getEncryptionIv(
-          env = TATVA_ENVIRONMENT.PROD, prodEncIv = PROD_ENC_IV, stagEncIv = STAGE_ENC_IV
-        )
-
-        Log.d("API Response", "data: $data")
-
-        val encryptedString = getEncryptedText(
-          data = data,
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "encryptedString: $encryptedString")
-
-        val decryptedString = getDecryptedData(
-          cipherText = encryptedString,
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "decryptedString: $decryptedString")
-
-        val headers = mapOf(
-          "api-key" to if (environment == TATVA_ENVIRONMENT.PROD) PROD_API_KEY else STAGE_API_KEY,
-          "token" to token,
-          "Content-Type" to "text/plain"
-        )
-
-        val url =
-          "${if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL}/cgm/logs"
-
-        val requestBody = encryptedString.toRequestBody("text/plain".toMediaType())
-
-        val response = apiServiceInterface.postCgmLogs(url, headers, requestBody).string()
-
-        val decryptedResponse = getDecryptedData(
-          cipherText = response.toString(),
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "API response: $decryptedResponse")
-
-        responseListener.onResponseSuccess(response)
-      } catch (e: Exception) {
-        responseListener.onResponseFail()
-        e.printStackTrace()
-        Log.d("API Response", "Exception: ${e.message}")
-      }
+    fun postCGMData(
+        environment: TATVA_ENVIRONMENT,
+        data: String,
+        token: String,
+        responseListener: ResponseListener
+    ) {
+        scope.launch {
+            try {
+
+                val apiServiceInterface = RetrofitInstance.getRetroInstance().create(
+                    ApiServiceInterface::class.java
+                )
+
+                val encryptionKey = getEncryptionKey(
+                    env = TATVA_ENVIRONMENT.PROD,
+                    prodEncKey = PROD_ENC_KEY,
+                    stagEncKey = STAGE_ENC_KEY
+                )
+
+                val encryptionIv = getEncryptionIv(
+                    env = TATVA_ENVIRONMENT.PROD, prodEncIv = PROD_ENC_IV, stagEncIv = STAGE_ENC_IV
+                )
+
+                Log.d("API Response", "data: $data")
+
+                val encryptedString = getEncryptedText(
+                    data = data,
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "encryptedString: $encryptedString")
+
+                val decryptedString = getDecryptedData(
+                    cipherText = encryptedString,
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "decryptedString: $decryptedString")
+
+                val headers = mapOf(
+                    "api-key" to if (environment == TATVA_ENVIRONMENT.PROD) PROD_API_KEY else STAGE_API_KEY,
+                    "token" to token,
+                    "Content-Type" to "text/plain"
+                )
+
+                val url =
+                    "${if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL}/cgm/logs"
+
+                val requestBody = encryptedString.toRequestBody("text/plain".toMediaType())
+
+                val response = apiServiceInterface.postCgmLogs(url, headers, requestBody).string()
+
+                val decryptedResponse = getDecryptedData(
+                    cipherText = response.toString(),
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "API response: $decryptedResponse")
+
+                responseListener.onResponseSuccess(response)
+            } catch (e: Exception) {
+                responseListener.onResponseFail()
+                e.printStackTrace()
+                Log.d("API Response", "Exception: ${e.message}")
+            }
+        }
     }
-  }
-
-
-  fun postDeviceData(
-    environment: TATVA_ENVIRONMENT,
-    data: String,
-    token: String,
-    loaderListener: LoaderListener
-  ) {
-    scope.launch {
-      try {
-        loaderListener.onShowLoader()
-
-        val apiServiceInterface = RetrofitInstance.getRetroInstance().create(
-          ApiServiceInterface::class.java
-        )
-
-        val encryptionKey = getEncryptionKey(
-          env = TATVA_ENVIRONMENT.PROD,
-          prodEncKey = PROD_ENC_KEY,
-          stagEncKey = STAGE_ENC_KEY
-        )
-
-        val encryptionIv = getEncryptionIv(
-          env = TATVA_ENVIRONMENT.PROD, prodEncIv = PROD_ENC_IV, stagEncIv = STAGE_ENC_IV
-        )
-
-        Log.d("API Response", "data: $data")
-
-        val encryptedString = getEncryptedText(
-          data = data,
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "encryptedString: $encryptedString")
-
-        val decryptedString = getDecryptedData(
-          cipherText = encryptedString,
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "decryptedString: $decryptedString")
-
-        val headers = mapOf(
-          "api-key" to if (environment == TATVA_ENVIRONMENT.PROD) PROD_API_KEY else STAGE_API_KEY,
-          "token" to token,
-          "Content-Type" to "text/plain"
-        )
-
-        val url =
-          "${if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL}/cgm/connection"
-
-        val requestBody = encryptedString.toRequestBody("text/plain".toMediaType())
-
-        val response = apiServiceInterface.postCgmLogs(url, headers, requestBody).string()
-
-        val decryptedResponse = getDecryptedData(
-          cipherText = response.toString(),
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "API response: $decryptedResponse")
-
-      } catch (e: Exception) {
-        e.printStackTrace()
-        Log.d("API Response", "Exception: ${e.message}")
-      } finally {
-        loaderListener.onHideLoader()
-      }
+
+
+    fun postDeviceData(
+        environment: TATVA_ENVIRONMENT,
+        data: String,
+        token: String,
+        loaderListener: LoaderListener
+    ) {
+        scope.launch {
+            try {
+                loaderListener.onShowLoader()
+
+                val apiServiceInterface = RetrofitInstance.getRetroInstance().create(
+                    ApiServiceInterface::class.java
+                )
+
+                val encryptionKey = getEncryptionKey(
+                    env = TATVA_ENVIRONMENT.PROD,
+                    prodEncKey = PROD_ENC_KEY,
+                    stagEncKey = STAGE_ENC_KEY
+                )
+
+                val encryptionIv = getEncryptionIv(
+                    env = TATVA_ENVIRONMENT.PROD, prodEncIv = PROD_ENC_IV, stagEncIv = STAGE_ENC_IV
+                )
+
+                Log.d("API Response", "data: $data")
+
+                val encryptedString = getEncryptedText(
+                    data = data,
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "encryptedString: $encryptedString")
+
+                val decryptedString = getDecryptedData(
+                    cipherText = encryptedString,
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "decryptedString: $decryptedString")
+
+                val headers = mapOf(
+                    "api-key" to if (environment == TATVA_ENVIRONMENT.PROD) PROD_API_KEY else STAGE_API_KEY,
+                    "token" to token,
+                    "Content-Type" to "text/plain"
+                )
+
+                val url =
+                    "${if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL}/cgm/connection"
+
+                val requestBody = encryptedString.toRequestBody("text/plain".toMediaType())
+
+                val response = apiServiceInterface.postCgmLogs(url, headers, requestBody).string()
+
+                val decryptedResponse = getDecryptedData(
+                    cipherText = response.toString(),
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "API response: $decryptedResponse")
+
+            } catch (e: Exception) {
+                e.printStackTrace()
+                Log.d("API Response", "Exception: ${e.message}")
+            } finally {
+                loaderListener.onHideLoader()
+            }
+        }
     }
-  }
-
-  fun getCGMData(
-    environment: TATVA_ENVIRONMENT,
-    token: String,
-    responseListener: ResponseListener
-  ) {
-    scope.launch {
-      try {
-
-        val apiServiceInterface = RetrofitInstance.getRetroInstance().create(
-          ApiServiceInterface::class.java
-        )
-
-        val encryptionKey = getEncryptionKey(
-          env = TATVA_ENVIRONMENT.PROD,
-          prodEncKey = PROD_ENC_KEY,
-          stagEncKey = STAGE_ENC_KEY
-        )
-
-        val encryptionIv = getEncryptionIv(
-          env = TATVA_ENVIRONMENT.PROD, prodEncIv = PROD_ENC_IV, stagEncIv = STAGE_ENC_IV
-        )
-
-        val headers = mapOf(
-          "api-key" to if (environment == TATVA_ENVIRONMENT.PROD) PROD_API_KEY else STAGE_API_KEY,
-          "token" to token
-        )
-
-        val url =
-          "${if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL}/cgm/status"
-
-        val response = apiServiceInterface.getCgmStatus(url, headers).string()
-
-        val decryptedResponse = getDecryptedData(
-          cipherText = response.toString(),
-          encryptionKey = encryptionKey,
-          encryptionIv = encryptionIv
-        )
-
-        Log.d("API Response", "API Response: $decryptedResponse")
-
-        responseListener.onResponseSuccess(decryptedResponse)
-      } catch (e: Exception) {
-        responseListener.onResponseFail()
-        e.printStackTrace()
-        Log.d("API Response", "Exception: ${e.message}")
-      }
+
+    fun getCGMData(
+        environment: TATVA_ENVIRONMENT,
+        token: String,
+        responseListener: ResponseListener
+    ) {
+        scope.launch {
+            try {
+
+                val apiServiceInterface = RetrofitInstance.getRetroInstance().create(
+                    ApiServiceInterface::class.java
+                )
+
+                val encryptionKey = getEncryptionKey(
+                    env = TATVA_ENVIRONMENT.PROD,
+                    prodEncKey = PROD_ENC_KEY,
+                    stagEncKey = STAGE_ENC_KEY
+                )
+
+                val encryptionIv = getEncryptionIv(
+                    env = TATVA_ENVIRONMENT.PROD, prodEncIv = PROD_ENC_IV, stagEncIv = STAGE_ENC_IV
+                )
+
+                val headers = mapOf(
+                    "api-key" to if (environment == TATVA_ENVIRONMENT.PROD) PROD_API_KEY else STAGE_API_KEY,
+                    "token" to token
+                )
+
+                val url =
+                    "${if (environment == TATVA_ENVIRONMENT.PROD) PROD_BASE_URL else STAGE_BASE_URL}/cgm/status"
+
+                val response = apiServiceInterface.getCgmStatus(url, headers).string()
+
+                val decryptedResponse = getDecryptedData(
+                    cipherText = response.toString(),
+                    encryptionKey = encryptionKey,
+                    encryptionIv = encryptionIv
+                )
+
+                Log.d("API Response", "API Response: $decryptedResponse")
+
+                responseListener.onResponseSuccess(decryptedResponse)
+            } catch (e: Exception) {
+                responseListener.onResponseFail()
+                e.printStackTrace()
+                Log.d("API Response", "Exception: ${e.message}")
+            }
+        }
     }
-  }
 
-  interface LoaderListener {
-    fun onShowLoader()
-    fun onHideLoader()
-  }
+    interface LoaderListener {
+        fun onShowLoader()
+        fun onHideLoader()
+    }
 
-  interface ResponseListener {
-    fun onResponseSuccess(response: String)
-    fun onResponseFail()
-  }
+    interface ResponseListener {
+        fun onResponseSuccess(response: String)
+        fun onResponseFail()
+    }
 
 }

package/android/src/main/java/com/mytatvarnsdk/utils/TatvaEncryptionConfig.kt

@@ -1,7 +1,7 @@
 package com.mytatvarnsdk.utils
 
 object TatvaEncryptionConfig {
-    const val STAGE_BASE_URL = "https://api-feature2.mytatva.in/api/v8"
+    const val STAGE_BASE_URL = "https://api-uat.mytatva.in/api/v8"
     const val PROD_BASE_URL = "https://api.mytatva.in/api/v8"
 
     const val PROD_ENC_KEY = "9Ddyaf6rfywpiTvTiax2iq6ykKpaxgJ6"

package/ios/Database/KLTBluetoothManager.m

@@ -298,6 +298,7 @@
                         
         if ([command isEqualToString:@"22"]) {
             // CT4重传的数据，pullGlucose_series_request 0x22的返回
+            //CT4 retransmission data returned by the pullGlucose_series_request (0x22) command
             [self handleResendDataWithPrefix22:characteristic.value];
         }
 
@@ -347,6 +348,7 @@
         
         if ([command isEqualToString:@"07"]) {
             // CT3/CT4 每3分钟上来的数据
+            //Data uploaded every 3 minutes from CT3/CT4
             [self handleReceiveDataWithPrefix07:characteristic.value];
         }
 
@@ -381,6 +383,7 @@
 #pragma mark - 发射器通用接受数据处理、算法计算处理
 
 // 发射器处理单条血糖数据的算法调用保存
+//Is the algorithm used by the transmitter to process a single glucose data point also responsible for saving it?
 - (void)handleCommonCT3GlucoseDataWithReceiveData:(ReceiveData *)receiveData {
     int glucoseId = receiveData.glucoseId.intValue;
     if (glucoseId >= self.eDevice.initNumber - 1) {
@@ -409,6 +412,7 @@
         self.resendType = ResendDataBeforeSetUserBG;
         
         //初始化期间接收到的数据存数据库的ReceiveData表中，不做处理
+        //The data received during initialization is stored in the ReceiveData table in the database without any processing.
         [[KLTDatabaseHandler shared] updatePOCAlgoBeforeRef:receiveData];
         KLTLog(@"计算receive.gluADC = %@, receive.error = %@", receiveData.gluADC, receiveData.error);
         if (!self.isInResend) {
@@ -468,6 +472,7 @@
 }
 
 // CT3/CT4 每3分钟上来的数据
+//Data uploaded every 3 minutes from CT3/CT4
 - (void)handleReceiveDataWithPrefix07:(NSData *)receiveData {
     if (self.status == BluetoothManagerStatusResendStart || self.isInResend) {
         // 重发数据期间不处理新收到的数据
@@ -504,6 +509,7 @@
 }
 
 // CT3 CT4重传的数据，pullGlucose_series_request 22的返回
+//Retransmitted data from CT3 and CT4, response of pullGlucose_series_request 0x22
 - (void)handleResendDataWithPrefix22:(NSData *)resendData {
     NSArray<Glucose *> *glucoseList = [ProtocalTools getGlucose_series:resendData andEDevice:self.eDevice];
     if (glucoseList.count == 0) {
@@ -520,8 +526,7 @@
             self.isFromPrefix22 = YES;
             [self handleCommonCT3GlucoseDataWithReceiveData:receive];
         }
-        
-       
+    
         [Notification_Center postNotificationName:KLTUpdateDataNotify object:NULL];
         NSLog(@"----------------------------------------------called handleResendDataWithPrefix22 for KLTUpdateDataNotify");
         NSInteger maxGlucoseId = [KLTDatabaseHandler.shared getLatestAndMaxGlucoseIdOfDevice:self.currentDevice];