@rentlydev/rently-tuya 0.1.1 → 0.1.3

package/android/src/main/java/com/rentlytuya/alerts/FormatSDCardAlert.kt

@@ -16,9 +16,14 @@ import com.rentlytuya.util.Util.strings
 
 @Composable
 fun FormatSDCardAlert(
+  id: String = "FormatSDCard",
+  title: String,
+  description: String,
+  confirmButtonText: String,
+  dismissButtonText: String,
   isFormatSDCardVisible: Boolean,
   onDismiss: () -> Unit,
-  onFormat: () -> Unit
+  onConfirm: () -> Unit
 ) {
 
   Alert(
@@ -31,7 +36,7 @@ fun FormatSDCardAlert(
     Label(
       modifier = Modifier
         .padding(bottom = 5.dp),
-      title = strings(id = R.string.formatSDCard),
+      title = title,
       bold = true,
       xl20 = true,
       black = true
@@ -40,7 +45,7 @@ fun FormatSDCardAlert(
     Label(
       modifier = Modifier
         .padding(vertical = 5.dp),
-      title = strings(id = R.string.formatSDCardDescription),
+      title = description,
       medium = true,
       l = true,
       black = true,
@@ -56,8 +61,8 @@ fun FormatSDCardAlert(
     ) {
       AnchorButton(
         modifier = Modifier,
-        id = "FormatSDCard_No",
-        title = strings(id = R.string.no),
+        id = "${id}_${dismissButtonText}",
+        title = dismissButtonText,
         semiBold = true,
         black = true,
         m = true,
@@ -68,13 +73,13 @@ fun FormatSDCardAlert(
 
       AnchorButton(
         modifier = Modifier,
-        id = "FormatSDCard_Yes",
-        title = strings(id = R.string.yes),
+        id = "${id}_${confirmButtonText}",
+        title = confirmButtonText,
         semiBold = true,
         black = true,
         m = true,
         onClick = {
-          onFormat()
+          onConfirm()
         }
       )
     }

package/android/src/main/java/com/rentlytuya/dashboard/AdvancedSettings.kt

@@ -123,9 +123,13 @@ fun StorageSettings(
   }
 
   FormatSDCardAlert(
+    title = strings(id = R.string.formatSDCard),
+    description = strings(id = R.string.formatSDCardDescription),
+    confirmButtonText = strings(id = R.string.yes),
+    dismissButtonText = strings(id = R.string.no),
     isFormatSDCardVisible = isFormatSDCardVisible.value,
     onDismiss = { isFormatSDCardVisible.value = false },
-    onFormat = {
+    onConfirm = {
       isFormatSDCardVisible.value = false
       Settings.formatSDCard(
         isLoading = isLoading

package/android/src/main/java/com/rentlytuya/dashboard/NavController.kt

@@ -36,6 +36,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.facebook.react.ReactApplication
 import com.rentlytuya.R
+import com.rentlytuya.alerts.FormatSDCardAlert
 import com.rentlytuya.components.Label
 import com.rentlytuya.components.LoadingIndicator
 import com.rentlytuya.tuya.DefaultSettings
@@ -46,6 +47,7 @@ import com.rentlytuya.tuya.Tuya.TAG
 import com.rentlytuya.tuya.Tuya.isDefaultSettingsUpdated
 import com.rentlytuya.tuya.Tuya.isResident
 import com.rentlytuya.ui.theme.LocalColor
+import com.rentlytuya.util.DPConstants
 import com.rentlytuya.util.DateUtil.isNotNull
 import com.rentlytuya.util.Heap
 import com.rentlytuya.util.Util.strings
@@ -95,6 +97,10 @@ fun NavController(
   val usedStorage = remember { mutableStateOf("0.0") }
   val remainingStorageCapacity = remember { mutableStateOf("0.0") }
 
+  // Format SD Card
+  val isFormatSDCardVisible = remember { mutableStateOf(false) }
+  val formatAttempts = remember { mutableIntStateOf(0) }
+
   val configuration = LocalConfiguration.current
 
   LaunchedEffect(Unit) {
@@ -177,7 +183,8 @@ fun NavController(
         batteryPercentage = batteryPercentage,
         totalStorageCapacity = totalStorageCapacity,
         usedStorage = usedStorage,
-        remainingStorageCapacity = remainingStorageCapacity
+        remainingStorageCapacity = remainingStorageCapacity,
+        isFormatSDCardVisible = isFormatSDCardVisible
       )
     }
 
@@ -190,8 +197,42 @@ fun NavController(
     ) {
       composable("Dashboard") {
         if (isLoading.value) {
-          LoadingIndicator(title = strings(id = R.string.closingConnection))
+          val loadingTitle = if (isFormatSDCardVisible.value) "Loading…" else strings(id = R.string.closingConnection)
+          LoadingIndicator(title = loadingTitle)
+        }
+
+        val (messageMain, messageNote) = when (formatAttempts.intValue) {
+          0 -> R.string.sdCardStatusAbnormalMain to R.string.sdCardStatusAbnormalNote
+          1 -> R.string.sdCardReformatFailedMain to null
+          else -> R.string.sdCardReformatFailedMain to R.string.sdCardReformatFailedNote
+        }
+
+        val confirmButtonText = if (formatAttempts.intValue == 0) {
+          strings(id = R.string.format)
+        } else {
+          strings(id = R.string.retryFormatting)
         }
+
+        FormatSDCardAlert(
+          id = "FormatSDCard_Abnormal",
+          isFormatSDCardVisible = isFormatSDCardVisible.value,
+          title = strings(id = R.string.doorbellSDCard),
+          description = strings(id = messageMain)
+            .plus(messageNote?.let { "\n\n${strings(id = it)}" } ?: ""),
+          confirmButtonText = confirmButtonText,
+          dismissButtonText = strings(id = R.string.cancel),
+          onDismiss = { isFormatSDCardVisible.value = false },
+          onConfirm = {
+            isFormatSDCardVisible.value = false
+            Settings.formatSDCard(
+              isLoading = isLoading,
+              onFailure = {
+                formatAttempts.intValue += 1
+              }
+            )
+          }
+        )
+
         Heap.trackEvent(eventName = "Dashboard Screen")
         Dashboard(
           modifier = Modifier.weight(if (!isSettings.value) 0.7f else 1f),

package/android/src/main/java/com/rentlytuya/tuya/Settings.kt

@@ -98,7 +98,8 @@ object Settings {
     batteryPercentage: MutableState<Int>,
     totalStorageCapacity: MutableState<String>,
     usedStorage: MutableState<String>,
-    remainingStorageCapacity: MutableState<String>
+    remainingStorageCapacity: MutableState<String>,
+    isFormatSDCardVisible: MutableState<Boolean>
   ) {
     val deviceBean = ThingHomeSdk.getDataInstance().getDeviceBean(deviceId)
     if (deviceBean.isNotNull()) {
@@ -212,7 +213,8 @@ object Settings {
       batteryPercentage = batteryPercentage,
       totalStorageCapacity = totalStorageCapacity,
       usedStorage = usedStorage,
-      remainingStorageCapacity = remainingStorageCapacity
+      remainingStorageCapacity = remainingStorageCapacity,
+      isFormatSDCardVisible = isFormatSDCardVisible
     )
   }
 
@@ -480,7 +482,9 @@ object Settings {
   }
 
   fun formatSDCard(
-    isLoading: MutableState<Boolean>? = null
+    isLoading: MutableState<Boolean>? = null,
+    onSuccess: (() -> Unit)? = null,
+    onFailure: (() -> Unit)? = null,
   ) {
     isLoading?.value = true
     publishDps(
@@ -488,10 +492,12 @@ object Settings {
       value = true,
       onSuccess = {
         isLoading?.value = false
+        onSuccess?.invoke()
         Log.i(TAG, "SD Card Format started")
       },
       onError = { code, error ->
         isLoading?.value = false
+        onFailure?.invoke()
         Log.i(TAG, "Error in SD Card Format: Error Code: $code, Error: $error")
       }
     )
@@ -579,7 +585,8 @@ object Settings {
     batteryPercentage: MutableState<Int>,
     totalStorageCapacity: MutableState<String>,
     usedStorage: MutableState<String>,
-    remainingStorageCapacity: MutableState<String>
+    remainingStorageCapacity: MutableState<String>,
+    isFormatSDCardVisible: MutableState<Boolean>
   ) {
     ThingHomeSdk.newDeviceInstance(deviceId).registerDevListener(object : IDevListener {
       override fun onDpUpdate(devId: String, dpStr: String) {
@@ -628,6 +635,9 @@ object Settings {
 
               DPConstants.SD_STATUS -> {
                 storageFunctionType.value = obj.getInt(key)
+                if (storageFunctionType.value == 2) {
+                  isFormatSDCardVisible.value = true
+                }
               }
 
               DPConstants.SD_RECORD_SWITCH -> {

package/android/src/main/res/values/strings.xml

@@ -113,6 +113,14 @@
   <string name="noMessages">No messages available at the moment.</string>
   <string name="unableToCaptureDetectedEvents">Unable to capture detected events because the doorbell\'s battery is too low. Please charge it to ensure events are detected and recorded.</string>
 
+  <!-- SD Card format -->
+  <string name="doorbellSDCard">Doorbell SD Card</string>
+  <string name="sdCardStatusAbnormalMain">The status of your doorbell’s SD card is abnormal, which may prevent new recordings from being stored. Would you like to format the SD card?</string>
+  <string name="sdCardStatusAbnormalNote">Important: Resetting will erase all previous recordings.</string>
+  <string name="sdCardReformatFailedMain">The SD card reformatting process has failed. Would you like to retry?</string>
+  <string name="sdCardReformatFailedNote">Note: If this issue persists, you may need to replace the SD card with a new one.</string>
+  <string name="retryFormatting">Retry Formatting</string>
+
   <!-- Additional -->
   <string name="closingConnection">Closing Connection…</string>
   <string name="ok">OK</string>

package/ios/dashboard/Dashboard.swift

@@ -6,6 +6,7 @@ struct Dashboard: View {
     @Binding var currentScreen: ScreenState
     @State private var isDoorbellControlVisible = true
     @State private var isPermissionDisclaimerAlertVisible = false
+    @State private var isSDCardAlertVisible = false
     @EnvironmentObject var orientationManager: OrientationManager
     
     var body: some View {
@@ -48,8 +49,29 @@ struct Dashboard: View {
         }
         .background(LocalColor.Monochrome.black)
         .onAppear(perform: handleOnAppear)
+        .onChange(of: Tuya.shared.sdCardStatus) { newValue in
+            if newValue == 2 {
+                isSDCardAlertVisible = true
+            }
+            else if newValue == 4 {
+                Tuya.shared.previewLoader = true
+            }
+        }
         .onChange(of: orientationManager.isLandscape) { _ in handleOrientation() }
         .onChange(of: isDoorbellControlVisible) { _ in handleOrientation() }
+
+        .alert(isPresented: $isSDCardAlertVisible) {
+            getAlert(
+                title: "Doorbell SD Card",
+                message: sdcardReformatTitle(for: Tuya.shared.noOfRetrysSdCardFormat),
+                primaryButtonTitle: Tuya.shared.noOfRetrysSdCardFormat == 0 ? "Format" : "Retry Formatting",
+                withCancelButton: true,
+                secondaryButtonTitle: "Cancel",
+                primaryAction: {
+                    SettingsManager.shared.formatSDCard()
+                }
+            )
+        }
         
         if tuya.dashboardLoader {
             ProgressView()
@@ -64,6 +86,14 @@ struct Dashboard: View {
         }
     }
     
+    private func sdcardReformatTitle(for noOfRetry: Int) -> String {
+        switch noOfRetry {
+            case 0: return "\nThe status of your doorbell’s SD card is abnormal, which may prevent new recordings from being stored. Would you like to format the SD card?\n\nImportant: Resetting will erase all previous recordings."
+            case 1: return "\nThe SD card reformatting process has failed.\nWould you like to retry?"
+            default: return "\nThe SD card reformatting process has failed. Would like to retry?\n\nNote: If this issue persists, you may need to replace the SD card with a new one."
+        }
+    }
+
     private func handleOrientation() {
         if orientationManager.isLandscape && isDoorbellControlVisible {
             DispatchQueue.main.asyncAfter(deadline: .now() + 3) {

package/ios/tuya/SettingsManager.swift

@@ -177,66 +177,69 @@ class SettingsManager: NSObject, ThingSmartCameraDPObserver {
         }
     }
     
-    // Format SD Card
-    func formatSDCard() {
-        withDPManager { dpManager in
-            guard self.isSupportedDP(dpKey: ThingSmartCameraDPKey.sdCardFormatDPName) else {
-                return
-            }
-            
-            Tuya.shared.settingsLoader = true
-            dpManager.setValue(
-                true,
-                forDP: ThingSmartCameraDPKey.sdCardFormatDPName,
-                success: { result in
-                    print("Tuya: Formatting started")
-                    Tuya.shared.settingsLoader = false
-                },
-                failure: { error in
-                    print("Tuya: Format failed")
-                    Tuya.shared.settingsLoader = false
-                }
-            )
-        }
-    }
-    
-    // Get Memory card Capaciry
-    func getMemoryCardCapacity() {
-        guard self.isSupportedDP(dpKey: ThingSmartCameraDPKey.sdCardStorageDPName) else {
-            print("Tuya: Get SD card capacity is not supported.")
-            return
-        }
-        
-        Tuya.shared.settingsLoader = true
-        
-        if let result = getDPValue(dpKey: .sdCardStorageDPName) as? String {
-            print("Tuya: Retrieve memory card status successfully. Result: \(result)")
-            let components = result.split(separator: "|")
-            
-            guard components.count == 3 else {
-                Tuya.shared.settingsLoader = false
-                return
-            }
-            
-            if let totalBytes = Double(components[0]) {
-                Tuya.shared.totalCapacity = totalBytes / 1024 / 1024
-            }
-            
-            if let usedBytes = Double(components[1]) {
-                Tuya.shared.used = usedBytes / 1024 / 1024
-            }
-            
-            if let remainingBytes = Double(components[2]) {
-                Tuya.shared.remainingCapacity = remainingBytes / 1024 / 1024
-            }
-            
-            Tuya.shared.settingsLoader = false
-        } else {
-            print("Tuya: No details available for the SD card.")
-            Tuya.shared.settingsLoader = false
-        }
-    }
-    
+   // Format SD Card
+   func formatSDCard() {
+       withDPManager { dpManager in
+           guard self.isSupportedDP(dpKey: ThingSmartCameraDPKey.sdCardFormatDPName) else {
+               return
+           }
+           
+           Tuya.shared.settingsLoader = true
+           dpManager.setValue(
+               true,
+               forDP: ThingSmartCameraDPKey.sdCardFormatDPName,
+               success: { result in
+                   print("Tuya: Formatting started")
+                   Tuya.shared.settingsLoader = false
+                   Tuya.shared.previewLoader = false
+               },
+               failure: { error in
+                   print("Tuya: Format failed")
+                   Tuya.shared.settingsLoader = false
+                   Tuya.shared.previewLoader = false
+                   Tuya.shared.noOfRetrysSdCardFormat += 1
+               }
+           )
+       }
+   }
+   
+   // Get Memory card Capaciry
+   func getMemoryCardCapacity() {
+       guard self.isSupportedDP(dpKey: ThingSmartCameraDPKey.sdCardStorageDPName) else {
+           print("Tuya: Get SD card capacity is not supported.")
+           return
+       }
+       
+       Tuya.shared.settingsLoader = true
+       
+       if let result = getDPValue(dpKey: .sdCardStorageDPName) as? String {
+           print("Tuya: Retrieve memory card status successfully. Result: \(result)")
+           let components = result.split(separator: "|")
+           
+           guard components.count == 3 else {
+               Tuya.shared.settingsLoader = false
+               return
+           }
+           
+           if let totalBytes = Double(components[0]) {
+               Tuya.shared.totalCapacity = totalBytes / 1024 / 1024
+           }
+           
+           if let usedBytes = Double(components[1]) {
+               Tuya.shared.used = usedBytes / 1024 / 1024
+           }
+           
+           if let remainingBytes = Double(components[2]) {
+               Tuya.shared.remainingCapacity = remainingBytes / 1024 / 1024
+           }
+           
+           Tuya.shared.settingsLoader = false
+       } else {
+           print("Tuya: No details available for the SD card.")
+           Tuya.shared.settingsLoader = false
+       }
+   }
+   
     func getFirmwareVersion() {
         guard Tuya.shared.device.isSupportCheckFirmware() else {
             print("Tuya: Firmware upgrade check is not supported for this device.")

package/ios/tuya/Tuya.swift

@@ -49,7 +49,8 @@ class Tuya: NSObject, ObservableObject {
     @Published var remainingCapacity = 0.0
     @Published var used = 0.0
     @Published var firwareVersion: String? = nil
-    
+    @Published var noOfRetrysSdCardFormat: Int = 0
+
     // Playback
     @Published var recordDays: [Int]? = nil
     @Published var playbackVideoList: [[AnyHashable : Any]]? = nil

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rentlydev/rently-tuya",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "rently-tuya",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",