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

package/android/src/main/java/cgmblelib/utils/SharedPreferencesLibraryUtil.java

@@ -10,60 +10,82 @@ import cgmblelib.qr.QRInformation;
 
 public class SharedPreferencesLibraryUtil {
 
-  BSharedPreferences prefsHelper;
-  private final String QRInfo = "QRInformation";
-  private final String SyncMeta = "SyncMeta";
+    BSharedPreferences prefsHelper;
+    private final String QRInfo = "QRInformation";
+    private final String SyncMeta = "SyncMeta";
+    private final String PatientId = "PatientId";
 
 
-  public SharedPreferencesLibraryUtil(Context context) {
-    prefsHelper = BSharedPreferences.getInstance(context);
-  }
+    public SharedPreferencesLibraryUtil(Context context) {
+        prefsHelper = BSharedPreferences.getInstance(context);
+    }
+
+    public QRInformation getQRInformation() {
+        try {
+            String message = prefsHelper.getData(QRInfo);
+            if (message == null || message.isEmpty()) {
+                return null;
+            }
+            return new Gson().fromJson(message, QRInformation.class);
+        } catch (Exception e) {
+            Log.d("Error => ", "getQRInformation: " + e.getMessage());
+            return null;
+        }
+    }
 
-  public QRInformation getQRInformation() {
-    try {
-      String message = prefsHelper.getData(QRInfo);
-      if (message == null || message.isEmpty()) {
-        return null;
-      }
-      return new Gson().fromJson(message, QRInformation.class);
-    } catch (Exception e) {
-      Log.d("Error => ", "getQRInformation: " + e.getMessage());
-      return null;
+
+    public void setQRInformation(String transmitterName, String qrmessage, float K, float R, String sensor) {
+        try {
+            Log.d("Error => ", "setQRInformation: " + transmitterName + qrmessage + K + R + sensor);
+            prefsHelper.saveData(QRInfo, new Gson().toJson(new QRInformation(transmitterName, qrmessage, R, K, sensor)));
+        } catch (Exception e) {
+            Log.d("Error => ", "setQRInformation: " + e.getMessage());
+        }
     }
-  }
 
+    public void setLastSyncData(SyncMeta syncMeta) {
+        try {
+            prefsHelper.saveData(SyncMeta, new Gson().toJson(syncMeta));
+        } catch (Exception e) {
+            Log.d("Error => ", "setLastSyncData: " + e.getMessage());
+        }
+    }
 
-  public void setQRInformation(String transmitterName, String qrmessage, float K, float R, String sensor) {
-    try {
-      Log.d("Error => ", "setQRInformation: " + transmitterName + qrmessage + K + R + sensor);
-      prefsHelper.saveData(QRInfo, new Gson().toJson(new QRInformation(transmitterName, qrmessage, R, K, sensor)));
-    } catch (Exception e) {
-      Log.d("Error => ", "setQRInformation: " + e.getMessage());
+    public SyncMeta getLastSyncData() {
+        try {
+            String message = prefsHelper.getData(SyncMeta);
+            if (message == null || message.isEmpty()) {
+                return null;
+            }
+            return new Gson().fromJson(message, SyncMeta.class);
+        } catch (Exception e) {
+            Log.d("Error => ", "getLastSyncData: " + e.getMessage());
+            return null;
+        }
     }
-  }
 
-  public void setLastSyncData(SyncMeta syncMeta) {
-    try {
-      prefsHelper.saveData(SyncMeta, new Gson().toJson(syncMeta));
-    } catch (Exception e) {
-      Log.d("Error => ", "setLastSyncData: " + e.getMessage());
+    public void setLastPatientId(String patientId) {
+        try {
+            prefsHelper.saveData(PatientId, patientId);
+        } catch (Exception e) {
+            Log.d("Error => ", "setLastUserId: " + e.getMessage());
+        }
     }
-  }
 
-  public SyncMeta getLastSyncData() {
-    try {
-      String message = prefsHelper.getData(SyncMeta);
-      if (message == null || message.isEmpty()) {
-        return null;
-      }
-      return new Gson().fromJson(message, SyncMeta.class);
-    } catch (Exception e) {
-      Log.d("Error => ", "getLastSyncData: " + e.getMessage());
-      return null;
+    public String getLastPatientId() {
+        try {
+            String message = prefsHelper.getData(PatientId);
+            if (message == null || message.isEmpty()) {
+                return null;
+            }
+            return message;
+        } catch (Exception e) {
+            Log.d("Error => ", "getLastUserId: " + e.getMessage());
+            return null;
+        }
     }
-  }
 
-  public void clearQRInformation() {
-    prefsHelper.saveData(QRInfo, null);
-  }
+    public void clearQRInformation() {
+        prefsHelper.saveData(QRInfo, null);
+    }
 }

package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt

@@ -2,15 +2,10 @@ package com.mytatvarnsdk
 
 import android.app.Application
 import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothManager
-import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
@@ -31,9 +26,6 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.mytatvarnsdk.activity.HelpActivity
-import com.mytatvarnsdk.activity.PermissionActivity
-import com.mytatvarnsdk.activity.PermissionUtils
-import com.mytatvarnsdk.activity.SearchTransmitterActivity
 import com.mytatvarnsdk.activity.StartCGMActivity
 import com.mytatvarnsdk.model.AllCGMLogRequest
 import com.mytatvarnsdk.model.CgmLog
@@ -123,7 +115,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun observeTransmitterUnbindStatus(token: String, apiResponse: String?) {
+    fun observeTransmitterUnbindStatus(token: String, apiResponse: String?, patientId: String) {
         try {
             if (apiResponse != null && apiResponse.isNotEmpty()) {
                 userToken = token
@@ -192,6 +184,15 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     val startDate = sensor.startDate
                     val endDate = sensor.endDate
                     val sensorId = sensor.sensorId
+                    val currentPatientId = patientId
+
+                    val lastPatientId = prefsHelper.lastPatientId
+                    val lastSensorId = prefsHelper.qrInformation.sensor
+
+                    if (lastPatientId != null && lastSensorId != null && (lastPatientId != currentPatientId || lastSensorId != sensorId)) {
+                        mModel.clearAllGlucoseAndDeviceData()
+                        return
+                    }
 
                     if (isCurrentDateInRange(startDate, endDate)) {
                         println("Current date is in range")
@@ -206,6 +207,9 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                                     DeviceStatus.TRANSMITTER_DISCONNECT.id,
                                     pocDevice.qrMessage
                                 )
+                            } else {
+                                prefsHelper.lastPatientId = currentPatientId
+                                prefsHelper.qrInformation.sensor = sensorId
                             }
                         } else {
                             postEventDataToAPI(

package/android/src/main/java/com/mytatvarnsdk/MainApplication.kt

@@ -39,8 +39,8 @@ class MainApplication : BApplication(), ReactApplication {
     super.onCreate()
     Log.d("MainApplication", "MainApplication onCreate called")
     SoLoader.init(this, false)
-    BleService.startService(this)
-    BSharedPreferences.init(this)
+//    BleService.startService(this)
+//    BSharedPreferences.init(this)
   }
 
   override fun getReactNativeHost(): ReactNativeHost {

package/android/src/main/java/com/mytatvarnsdk/activity/PermissionActivity.kt

@@ -94,17 +94,23 @@ class PermissionActivity : BasePermissionActivity() {
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             val connectPermission = ContextCompat.checkSelfPermission(
                 context,
-                android.Manifest.permission.BLUETOOTH_CONNECT
+                Manifest.permission.BLUETOOTH_CONNECT
             ) == PackageManager.PERMISSION_GRANTED
 
             val scanPermission = ContextCompat.checkSelfPermission(
                 context,
-                android.Manifest.permission.BLUETOOTH_SCAN
+                Manifest.permission.BLUETOOTH_SCAN
             ) == PackageManager.PERMISSION_GRANTED
 
-            connectPermission && scanPermission
+            val advertisePermission = ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.BLUETOOTH_ADVERTISE
+            ) == PackageManager.PERMISSION_GRANTED
+
+            // Include advertisePermission only if your app uses Bluetooth advertising
+            connectPermission && scanPermission && advertisePermission
         } else {
-            // For Android 11 and below, permission is granted at install time
+            // For Android 11 and below, permission is granted at install time or via location
             true
         }
     }

package/android/src/main/java/com/mytatvarnsdk/activity/StartCGMActivity.kt

@@ -1,6 +1,7 @@
 package com.mytatvarnsdk.activity
 
 import android.app.Dialog
+import android.bluetooth.BluetoothAdapter
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
@@ -33,6 +34,9 @@ class StartCGMActivity : AppCompatActivity() {
     private lateinit var binding: ActivityStartCgmactivityBinding
     private var isForReconnect: Boolean = false
     private val reactContext = CgmTrackyLibModule.mReactContext
+    private val bluetoothAdapter: BluetoothAdapter? by lazy {
+        BluetoothAdapter.getDefaultAdapter()
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,7 +67,7 @@ class StartCGMActivity : AppCompatActivity() {
             sendDataToRN("", "cgm_start_connection_journey_clicked")
 
             if (isForReconnect) {
-                val intent = if (areAllPermissionsGranted()) {
+                val intent = if (areAllPermissionsGranted() && bluetoothAdapter!!.isEnabled) {
                     Intent(this, SearchTransmitterActivity::class.java).putExtra(
                         "IsForReconnect",
                         true

package/android/src/main/java/com/mytatvarnsdk/model/BaseViewModel.java

@@ -8,7 +8,6 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.Transformations;
 
-import java.util.Date;
 import java.util.List;
 
 import cgmblelib.database.entity.PocDevice;
@@ -22,88 +21,93 @@ import cgmblelib.database.repository.RepositoryGlucose;
  * @author minyuchun
  */
 public class BaseViewModel extends AndroidViewModel {
-  /**
-   * 设备信息储存库
-   */
-  private RepositoryDevice mRepositoryDevice;
-  /**
-   * 血糖信息储存库
-   */
-  private RepositoryGlucose mRepositoryGlucose;
-  /**
-   * 最新的设备(数据库中最大Id的设备，无论是绑定还是非绑定)
-   */
-  private LiveData<PocDevice> mDevice;
-  /**
-   * 血糖数据集列表持久化
-   */
-  private LiveData<List<PocGlucose>> mGlucoseList;
-  /**
-   * 最新的血糖数据持久化，当发射器绑定时，获取最新的，若发射器解除绑定则无
-   */
-  private LiveData<PocGlucose> mLatestGlucose;
-  /***
-   * 设备是否绑定
-   */
-  private MediatorLiveData<Integer> mBindDeviceId = new MediatorLiveData<>();
-
-  public BaseViewModel(@NonNull Application application) {
-    super(application);
-    mRepositoryDevice = RepositoryDevice.getInstance(application);
-    mRepositoryGlucose = RepositoryGlucose.getInstance(application);
-    mDevice = mRepositoryDevice.getLiveDataLatestDeviceIoThread();
-    mBindDeviceId.addSource(mDevice, device -> {
-      if (device != null && device.isBound()) {
-        if (mBindDeviceId.getValue() == null || mBindDeviceId.getValue() != device.getId()) {
-          mBindDeviceId.setValue(device.getId());
-        }
-      } else {
-        mBindDeviceId.setValue(0);
-      }
-    });
-    LoadGlucose();
-  }
-
-  /**
-   * 获取持久化设备数据,获取最新的设备的所有信息
-   */
-  public synchronized LiveData<PocDevice> getDevice() {
-    return mDevice;
-  }
-
-  public synchronized LiveData<List<PocGlucose>> getAllGlucose() {
-    return mGlucoseList;
-  }
-
-  public synchronized LiveData<PocGlucose> getLatestGlucose() {
-    return mLatestGlucose;
-  }
-
-  /**
-   * 获取血糖数据
-   */
-  private synchronized void LoadGlucose() {
-    mGlucoseList = Transformations.switchMap(mBindDeviceId, input -> mRepositoryGlucose.getLiveDataGlucoseListByDeviceId(input));
-    mLatestGlucose = Transformations.map(mGlucoseList, input -> {
-      if (input != null && input.size() > 0) {
-        return input.get(input.size() - 1);
-      } else {
-        return null;
-      }
-    });
-  }
-
-
-  public List<PocGlucose> getGlucoseByTime() {
-    return mRepositoryGlucose.getGlucoseByDeviceIdAndTimeMillis(7, 1748005587474L);
-  }
-
-  public List<PocGlucose> getGlucoseBetweenTime(long startTime) {
-    return mRepositoryGlucose.getGlucoseByTimeMillis(startTime, System.currentTimeMillis());
-  }
-
-  public PocDevice getDeviceInfo(int deviceId) {
-    return mRepositoryDevice.getDeviceByIdIoThread(deviceId);
-  }
+    /**
+     * 设备信息储存库
+     */
+    private RepositoryDevice mRepositoryDevice;
+    /**
+     * 血糖信息储存库
+     */
+    private RepositoryGlucose mRepositoryGlucose;
+    /**
+     * 最新的设备(数据库中最大Id的设备，无论是绑定还是非绑定)
+     */
+    private LiveData<PocDevice> mDevice;
+    /**
+     * 血糖数据集列表持久化
+     */
+    private LiveData<List<PocGlucose>> mGlucoseList;
+    /**
+     * 最新的血糖数据持久化，当发射器绑定时，获取最新的，若发射器解除绑定则无
+     */
+    private LiveData<PocGlucose> mLatestGlucose;
+    /***
+     * 设备是否绑定
+     */
+    private MediatorLiveData<Integer> mBindDeviceId = new MediatorLiveData<>();
+
+    public BaseViewModel(@NonNull Application application) {
+        super(application);
+        mRepositoryDevice = RepositoryDevice.getInstance(application);
+        mRepositoryGlucose = RepositoryGlucose.getInstance(application);
+        mDevice = mRepositoryDevice.getLiveDataLatestDeviceIoThread();
+        mBindDeviceId.addSource(mDevice, device -> {
+            if (device != null && device.isBound()) {
+                if (mBindDeviceId.getValue() == null || mBindDeviceId.getValue() != device.getId()) {
+                    mBindDeviceId.setValue(device.getId());
+                }
+            } else {
+                mBindDeviceId.setValue(0);
+            }
+        });
+        LoadGlucose();
+    }
+
+    /**
+     * 获取持久化设备数据,获取最新的设备的所有信息
+     */
+    public synchronized LiveData<PocDevice> getDevice() {
+        return mDevice;
+    }
+
+    public synchronized LiveData<List<PocGlucose>> getAllGlucose() {
+        return mGlucoseList;
+    }
+
+    public synchronized LiveData<PocGlucose> getLatestGlucose() {
+        return mLatestGlucose;
+    }
+
+    /**
+     * 获取血糖数据
+     */
+    private synchronized void LoadGlucose() {
+        mGlucoseList = Transformations.switchMap(mBindDeviceId, input -> mRepositoryGlucose.getLiveDataGlucoseListByDeviceId(input));
+        mLatestGlucose = Transformations.map(mGlucoseList, input -> {
+            if (input != null && input.size() > 0) {
+                return input.get(input.size() - 1);
+            } else {
+                return null;
+            }
+        });
+    }
+
+
+    public List<PocGlucose> getGlucoseByTime() {
+        return mRepositoryGlucose.getGlucoseByDeviceIdAndTimeMillis(7, 1748005587474L);
+    }
+
+    public List<PocGlucose> getGlucoseBetweenTime(long startTime) {
+        return mRepositoryGlucose.getGlucoseByTimeMillis(startTime, System.currentTimeMillis());
+    }
+
+    public PocDevice getDeviceInfo(int deviceId) {
+        return mRepositoryDevice.getDeviceByIdIoThread(deviceId);
+    }
+
+    public void clearAllGlucoseAndDeviceData() {
+        mRepositoryGlucose.deleteAllGlucoseData();
+        mRepositoryDevice.deleteAllDeviceData();
+    }
 
 }

package/ios/Database/KLTBluetoothManager.m

@@ -265,6 +265,7 @@
 }
 
 // 获取外设发来的数据，不论是read还是notify，获取数据都是从这个方法中读取。
+//To receive data sent from the peripheral, whether through read or notify, the data is obtained from this method.
 - (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
     if (error) {
         return;
@@ -421,6 +422,7 @@
 }
 
 // 发射器处理单条血糖数据的通用解析
+//Generic parsing of a single blood glucose data packet by the transmitter
 - (ReceiveData *)handleCommonReceiveGluData:(Glucose *)gluData commandText:(NSString *)commandText {
     Device *currentDevice = self.currentDevice;
     //接收到的数据先存放到ReceiveDataInfo表
@@ -488,6 +490,7 @@
         [self closeBleSensor];
     } else {
         // 数据没拉取完继续拉取蓝牙断开期间的数据（0x22拉取协议）
+        //Continue retrieving the remaining data that wasn't pulled before, including the data generated during the Bluetooth disconnection (using the 0x22 retrieval protocol).
         NSInteger pullNums = 20;
         if (remain_points < pullNums) {
             pullNums = remain_points;
@@ -518,6 +521,7 @@
             [self handleCommonCT3GlucoseDataWithReceiveData:receive];
         }
         
+       
         [Notification_Center postNotificationName:KLTUpdateDataNotify object:NULL];
         NSLog(@"----------------------------------------------called handleResendDataWithPrefix22 for KLTUpdateDataNotify");
         NSInteger maxGlucoseId = [KLTDatabaseHandler.shared getLatestAndMaxGlucoseIdOfDevice:self.currentDevice];

package/ios/Database/KLTDatabaseHandler.m

@@ -130,6 +130,20 @@
     glucose.temperature = data.temperature;
     float algo_k = [[User_Defaults objectForKey:@"algo_k"] floatValue];
     float algo_r = [[User_Defaults objectForKey:@"algo_r"] floatValue];
+    
+    NSString *dateString = data.receiveDateTime;
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"UTC"]];
+    NSDate *date = [dateFormatter dateFromString:dateString];
+    if (date) {
+        NSTimeInterval timeMillis = [date timeIntervalSince1970] * 1000; // Convert to milliseconds
+        NSLog(@"Milliseconds since epoch: %.0f", timeMillis);
+        NSNumber *numberFromTimeMillis = [NSNumber numberWithDouble:timeMillis]; // Wrap the NSTimeInterval into an NSNumber
+    } else {
+        NSLog(@"Invalid date string format");
+    }
+
 
     LatestData *d = nil;
     NSString *localName = data.device.advertise.localName;
@@ -137,13 +151,24 @@
     if (userBG > 0) {
         d = [[LatestData alloc] initWithParameters:glucose.dataId.intValue andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andNewBgToGlucoseId:glucose.dataId.intValue andNewBgValue:userBG andName:localName];
     } else {
-        d = [[LatestData alloc] initWithParameters:([glucose.dataId intValue]) andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andName:localName];
+        d = [[LatestData alloc] initWithParameters:([glucose.dataId intValue]) andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andName:localName ];
     }
     d.algorithm = AlgorithmType_CT4;
+    
+
+   
+    NSLog( @"sensorInfosensorInf %f", d.R);
+
+    NSLog( @"sensorInfosensorInfosensorInfosensorInfo %@", d.sensorInfo);
+    
+    NSLog(@"算法入参dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, algorithm=%@, year=%@, milles=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.algorithm), @(d.year), @(d.timeMillis));
+    
+ 
+
 
-    KLTLog(@"算法入参dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, newBgValue=%@, algorithm=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.newBgValue), @(d.algorithm));
     CurrentGlucose *currentGlucose = [AlgorithmTools algorithmLatestGlucose:d];
     
+
     if (currentGlucose.errorCode == ERROR_CODE_ALGORITHM_DATA) {
         [self reloadQueryHistoryData];
         
@@ -153,11 +178,35 @@
             d = [[LatestData alloc] initWithParameters:([glucose.dataId intValue]) andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andName:localName];
         }
         d.algorithm = AlgorithmType_CT4;
+       
 
-        KLTLog(@"ERROR_CODE_ALGORITHM_DATA:dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, newBgValue=%@, algorithm=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.newBgValue), @(d.algorithm));
+        NSLog(@"ERROR_CODE_ALGORITHM_DATA:dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, newBgValue=%@, algorithm=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.newBgValue), @(d.algorithm));
         currentGlucose = [AlgorithmTools algorithmLatestGlucose:d];
+        
+        NSString *logString = [NSString stringWithFormat:@"glucoseId=%@, Iw=%@, Ib=%@, T=%@,dayCount=%@, hour=%@, minute=%@, milles=%@, GluMG=%@,BGCount=%@, BGICount=%@, errorCode=%@  trend=%@  calibrationStatus=%@,  countdownDays=%@, countdownHours=%@, countdownMinutes=%@ ",
+            @(d.glucoseId),
+            @(d.Iw),
+            @(d.Ib),
+            @(d.T),
+            @(d.day),
+            @(d.hour),
+            @(d.minute),
+            @(d.timeMillis),
+            @(currentGlucose.GluMG),
+            @(currentGlucose.BGCount),
+            @(currentGlucose.BGICount),
+            @(currentGlucose.errorCode),
+            @(currentGlucose.trend),
+            @(currentGlucose.BGMG),
+            @(currentGlucose.countdownDays),
+            @(currentGlucose.countdownHours),
+            @(currentGlucose.countdownHours)
+                               
+        ];
+        
     }
 
+    
     glucose.errorCode = @(currentGlucose.errorCode);
     glucose.trend = @(currentGlucose.trend);
     /* glucose.glu 保存 ADC 算法结果 单位mmol */
@@ -172,11 +221,29 @@
     data.calibration = @(currentGlucose.BGMG);
     data.error = @(currentGlucose.errorCode);
     data.trend = @(currentGlucose.trend);
-    data.countdownDays = @(currentGlucose.countdownDays);
-    data.countdownHours = @(currentGlucose.countdownHours);
-    data.countdownMinutes = @(currentGlucose.countdownMinutes);
     
-    [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object:data];
+    NSString *logString = [NSString stringWithFormat:@"glucoseId=%@, Iw=%@, Ib=%@, T=%@,dayCount=%@, hour=%@, minute=%@, milles=%@, GluMG=%@,BGCount=%@, BGICount=%@, errorCode=%@  trend=%@  calibrationStatus=%@,  countdownDays=%@, countdownHours=%@, countdownMinutes=%@ ",
+        @(d.glucoseId),
+        @(d.Iw),
+        @(d.Ib),
+        @(d.T),
+        @(d.day),
+        @(d.hour),
+        @(d.minute),
+        @(d.timeMillis),
+        @(currentGlucose.GluMG),
+        @(currentGlucose.BGCount),
+        @(currentGlucose.BGICount),
+        @(currentGlucose.errorCode),
+        @(currentGlucose.trend),
+        @(currentGlucose.BGMG),
+        @(currentGlucose.countdownDays),
+        @(currentGlucose.countdownHours),
+        @(currentGlucose.countdownHours)
+                           
+    ];
+    
+    
     [self.appDelegate saveContext];
     return glucose;
 }
@@ -327,6 +394,8 @@
     }
 
     resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
+    NSLog(@"entity: %@", entity);
+    NSLog(@"predicate: %@", predicate);
     NSLog(@"📡 resendDatas: %@", resendDatas);
     
     return resendDatas;
@@ -379,6 +448,7 @@
 }
 
 // 查询最近一次连接的最大的血糖ID
+//Query the highest blood glucose ID from the most recent connection
 - (NSInteger)getLatestAndMaxGlucoseIdOfDevice:(Device *)currentDevice {
     NSArray *array = [self queryReceiveDataWithDevice:currentDevice needUserBG:NO];
     if (array.count > 0) {

package/ios/ViewModel/FinalViewModel.swift

@@ -486,6 +486,7 @@ class FinalViewModel: NSObject {
         switch status {
             
         case .disconnected:
+            print("----device is disconnected--------")
             print("lastBluetoothStatus-------->> \(lastBluetoothStatus)")
             if lastBluetoothStatus == .connected {
                 print("===> Previously connected, delaying disconnect for 1 minute")
@@ -523,10 +524,11 @@ class FinalViewModel: NSObject {
                 startScanTimer = nil
                 print("--------------------------- startScanTimer is nil")
             }
-
+            print("---device is connected--------")
             debouncer.update(with: CGMConnectionStatus.connected)
 
         case .timeOut:
+            print("----device is timeOut--------")
             lastBluetoothStatus = .timeOut
             if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
                 startScanTimer = Timer.scheduledTimer(timeInterval: 20,
@@ -537,14 +539,17 @@ class FinalViewModel: NSObject {
             }
 
         case .sensorLostPower:
+            print("----device is sensorLostPower--------")
             lastBluetoothStatus = .sensorLostPower
             sensorLostPower()
             
         case .updateBindWatchSuccess:
+            print("----device is updateBindWatchSuccess--------")
             lastBluetoothStatus = .updateBindWatchSuccess
             startCountDown()
             
         case .closed:
+            print("----device is closed--------")
             lastBluetoothStatus = .closed
             debouncer.update(with: CGMConnectionStatus.transmitterDisconnect)
             

package/lib/commonjs/CGMConnect.js

@@ -102,10 +102,10 @@ const helpCGM = async token => {
   }
 };
 exports.helpCGM = helpCGM;
-const observeTransmitterUnbindStatusHandler = async (token, apiResponse) => {
+const observeTransmitterUnbindStatusHandler = async (token, apiResponse, patientId) => {
   console.log('observeTransmitterUnbindStatusHandler====');
   try {
-    const result = await cgmLib.observeTransmitterUnbindStatus(token, apiResponse);
+    const result = await cgmLib.observeTransmitterUnbindStatus(token, apiResponse, patientId);
     console.log(result);
   } catch (error) {
     console.error(error);