react-native-mytatva-rn-sdk 1.2.46 → 1.2.49

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

@@ -3,11 +3,6 @@ package com.mytatvarnsdk.utils
 object TatvaEncryptionConfig {
     const val STAGE_BASE_URL = "https://api-feature2.mytatva.in/api/v8"
     const val PROD_BASE_URL = "https://api.mytatva.in/api/v8"
-    const val UAT_BASE_URL = "https://api-uat.mytatva.in"
-
-    const val GOODFLIP_PROD_SITE_URL = "https://app.goodflip.in"
-    const val GOODFLIP_DEV_SITE_URL = "https://app-uat.goodflip.in"
-    const val GOODFLIP_ACHIEVE_DEV_SITE_URL = "https://uat.goodflip.in"
 
     const val PROD_ENC_KEY = "9Ddyaf6rfywpiTvTiax2iq6ykKpaxgJ6"
     const val STAGE_ENC_KEY = "9Ddyaf6rfywpiTvTiax2iq6ykKpaxgJ6"

package/android/src/main/res/layout/activity_video.xml

@@ -8,6 +8,15 @@
     android:background="#E6000000"
     tools:context=".activity.VideoActivity">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/ivClose"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:padding="7dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_close_gray" />
+
     <com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
         android:id="@+id/youtube_player_view"
         android:layout_width="match_parent"
@@ -23,10 +32,12 @@
         android:id="@+id/full_screen_view_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

package/ios/Database/KLTBluetoothManager.m

@@ -363,13 +363,13 @@
         }
 
         if ([command isEqualToString:@"11"]) {
-            // CT3 CT4重传数据完毕调用重置协议(响应)
+            // Reset response received from CT3/CT4
             TransmitterReset *resetData = [ProtocalTools reset_response2:characteristic.value andEDevice:self.eDevice];
             if (resetData.isBind) {
-                //重置成功-->CT3发射低功耗协议
+                // Transmitter is still bound → send low-power mode command
                 [peripheral writeValue:[ProtocalTools lowPower_request:self.eDevice] forCharacteristic:self.writeReadCharacteristic type:CBCharacteristicWriteWithoutResponse];
             } else {
-                // CT3发射器解除绑定（如场景：发射器进行充电重启后再连接时发现为未绑定状态）
+                // Transmitter is unbound (e.g., reset + power cycle)
                 self.status = BluetoothManagerStatusSensorLostPower;
             }
         }
@@ -391,6 +391,10 @@
         GlucoseData *glucose = [[KLTDatabaseHandler shared] addCT3GlucoseDataWithReceiveData:receiveData];        
         KLTLog(@"计算glucose.gluADC = %@, glucose.errorCode = %@", glucose.gluADC, glucose.errorCode);
         [currentDevice addGlucoseDatasObject:glucose];
+        KLTLog(@"==============>>> GlucoseData");
+        KLTLog(@"GlucoseData Details:\n""gluADC: %@\n""glu: %@\n""errorCode: %@\n""temperature: %@\n""trend: %@\n""dataId: %@\n""operatingCurrent: %@\n""blankCurrent: %@\n""k: %@\n""iw: %@\n""calibrationStatus: %@\n""initialBeginDate: %@\n""receiveDateTime: %@\n""userBG: %@\n""device: %@",
+               glucose.gluADC,glucose.glu,glucose.errorCode,glucose.temperature,glucose.trend,glucose.dataId,glucose.operatingCurrent,glucose.blankCurrent,glucose.k,glucose.iw,glucose.calibrationStatus,glucose.initialBeginDate,glucose.receiveDateTime,glucose.userBG,glucose.device.deviceName);
+
         if (!self.isInResend) {
             [Notification_Center postNotificationName:@"latestGluData" object:glucose];
             self.status = BluetoothManagerStatusGetGLU;
@@ -515,7 +519,7 @@
         }
         
         [Notification_Center postNotificationName:KLTUpdateDataNotify object:NULL];
-        
+        NSLog(@"----------------------------------------------called handleResendDataWithPrefix22 for KLTUpdateDataNotify");
         NSInteger maxGlucoseId = [KLTDatabaseHandler.shared getLatestAndMaxGlucoseIdOfDevice:self.currentDevice];
         NSInteger remain_points = self.eDevice.endNumber - (maxGlucoseId + 1);
         if (remain_points <= 0) {
@@ -540,6 +544,7 @@
     [self handleCommonCT3GlucoseDataWithReceiveData:receive];
     [Notification_Center postNotificationName:@"DidHandleResendDataNoReload" object:nil];
     [Notification_Center postNotificationName:KLTUpdateDataNotify object:NULL];
+    NSLog(@"----------------------------------------------called handleReceiveDataWithPrefix07Glucose for KLTUpdateDataNotify");
     NSInteger remain_points = [KLTDatabaseHandler.shared numberOfLifeCycleSensorWithDevice:self.currentDevice endNumber:self.eDevice.endNumber];
     if (remain_points <= 0) {
         [self closeBleSensor];

package/ios/Database/KLTDatabaseHandler.m

@@ -191,18 +191,51 @@
 }
 
 
+//- (NSArray<GlucoseData*> *)queryGlucoseDataWithDevice:(Device *)currentDevice {
+//    NSEntityDescription *entity = [NSEntityDescription entityForName:@"GlucoseData" inManagedObjectContext:self.context];
+//    NSFetchRequest *request = [[NSFetchRequest alloc] init];
+//    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@", currentDevice.identifier, currentDevice.initialBeginDate];
+//    request.entity = entity;
+//    request.predicate = predicate;
+//    NSArray *resendDatas = [self.context executeFetchRequest:request error:nil];
+//    resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
+//    return resendDatas;
+//}
+
 - (NSArray<GlucoseData*> *)queryGlucoseDataWithDevice:(Device *)currentDevice {
     NSEntityDescription *entity = [NSEntityDescription entityForName:@"GlucoseData" inManagedObjectContext:self.context];
     NSFetchRequest *request = [[NSFetchRequest alloc] init];
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@", currentDevice.identifier, currentDevice.initialBeginDate];
     request.entity = entity;
     request.predicate = predicate;
+    
     NSArray *resendDatas = [self.context executeFetchRequest:request error:nil];
     resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
+
+    // 🖨️ Add single-line logging for each GlucoseData entry
+    NSLog(@"==== GlucoseData (Fetched %lu records) for Device: %@ ====", (unsigned long)resendDatas.count, currentDevice.identifier);
+    for (GlucoseData *g in resendDatas) {
+        NSLog(@"[ID:%@] Date:%@ | glu:%@ mmol/L | gluADC:%@ mg/dL | BG:%@ | T:%@°C | Ib:%@ | Iw:%@ | Trend:%@ | Err:%@ | CalStatus:%@",
+              g.dataId,
+              g.receiveDateTime,
+              g.glu,
+              g.gluADC,
+              g.userBG,
+              g.temperature,
+              g.blankCurrent,
+              g.operatingCurrent,
+              g.trend,
+              g.errorCode,
+              g.calibrationStatus
+        );
+    }
+
     return resendDatas;
 }
 
 
+
+
 // 如果不是第一次连接发射器，更新device连接次数和连接时间
 - (void)updateDeviceWithDeviceId:(NSString *)identify 
                      scannedTime:(NSString *)scannedTime
@@ -267,24 +300,38 @@
         NSLog(@"Core Data context is nil");
         return @[];
     }
+    
     NSEntityDescription *entity = [NSEntityDescription entityForName:@"ReceiveDataInfo" inManagedObjectContext:self.context];
+    if (!entity) {
+        NSLog(@"Entity 'ReceiveDataInfo' not found in Core Data model");
+        return @[];
+    }
+    
     NSFetchRequest *request = [[NSFetchRequest alloc] init];
+    request.entity = entity;
+
     NSPredicate *predicate;
     if (needUserBG) {
-        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ && gluADC > 0 && gluADC != NIL AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
+        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND gluADC > 0 AND gluADC != nil AND isDelete == nil", currentDevice.identifier, currentDevice.initialBeginDate];
     } else {
-        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
+        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND isDelete == nil", currentDevice.identifier, currentDevice.initialBeginDate];
     }
-    request.entity = entity;
     request.predicate = predicate;
-    if (!entity) {
-        NSLog(@"Entity 'ReceiveDataInfo' not found in Core Data model");
+
+    NSError *fetchError = nil;
+    NSArray *resendDatas = [self.context executeFetchRequest:request error:&fetchError];
+    
+    if (fetchError) {
+        NSLog(@"❌ Fetch error: %@", fetchError.localizedDescription);
         return @[];
     }
-    NSArray *resendDatas = [self.context executeFetchRequest:request error:nil];
+
     resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
+    NSLog(@"📡 resendDatas: %@", resendDatas);
+    
     return resendDatas;
 }
+
 - (NSArray *)queryAllReceiveData {
     NSEntityDescription *entity = [NSEntityDescription entityForName:@"ReceiveDataInfo" inManagedObjectContext:self.context];
     NSFetchRequest *request = [[NSFetchRequest alloc] init];

package/ios/MyReactNativeBridge.h

@@ -8,13 +8,16 @@
 #ifndef MyReactNativeBridge_h
 #define MyReactNativeBridge_h
 
+#import "GlucoseData+CoreDataClass.h"
+#import "Device+CoreDataClass.h"
+
 
 #endif /* MyReactNativeBridge_h */
 #import "KLTAppDelegate.h"
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
-
+#import "KLTDatabaseHandler.h"
 @interface CgmTrackyLib : RCTEventEmitter <RCTBridgeModule>
 
 @end