@onekeyfe/react-native-device-utils 1.1.18 → 1.1.20

package/ReactNativeDeviceUtils.podspec

@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
+  s.dependency 'ReactNativeNativeLogger'
 
   load 'nitrogen/generated/ios/ReactNativeDeviceUtils+autolinking.rb'
   add_nitrogen_files(s)

package/android/build.gradle

@@ -133,4 +133,6 @@ dependencies {
   implementation "androidx.appcompat:appcompat:1.7.1"
   // AndroidX Preference for PreferenceManager
   implementation "androidx.preference:preference-ktx:1.2.1"
+
+  implementation project(":react-native-native-logger")
 }

package/android/src/main/java/com/margelo/nitro/reactnativedeviceutils/ReactNativeDeviceUtils.kt

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.Rect
 import android.os.Build
+import com.margelo.nitro.nativelogger.OneKeyLog
 import androidx.preference.PreferenceManager
 import androidx.core.content.ContextCompat
 import androidx.core.util.Consumer
@@ -215,12 +216,12 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
     )
   }
 
-  private var windowLayoutInfo: WindowLayoutInfo? = null
+  @Volatile private var windowLayoutInfo: WindowLayoutInfo? = null
   private var isSpanning = false
   private var layoutInfoConsumer: Consumer<WindowLayoutInfo>? = null
   private var windowInfoTracker: WindowInfoTracker? = null
   private var callbackAdapter: WindowInfoTrackerCallbackAdapter? = null
-  private var spanningChangedListeners: MutableList<Listener> = CopyOnWriteArrayList()
+  private val spanningChangedListeners: CopyOnWriteArrayList<Listener> = CopyOnWriteArrayList()
   private var isObservingLayoutChanges = false
   private var nextListenerId = 0.0
   private var isDualScreenDeviceDetected: Boolean? = null
@@ -236,10 +237,14 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
     try {
       val context = NitroModules.applicationContext ?: return
       val prefs = PreferenceManager.getDefaultSharedPreferences(context)
-      val style = prefs.getString(PREF_KEY_UI_STYLE, null) ?: return
+      val style = prefs.getString(PREF_KEY_UI_STYLE, null) ?: run {
+        OneKeyLog.debug("DeviceUtils", "No saved UI style found")
+        return
+      }
+      OneKeyLog.info("DeviceUtils", "Restored UI style: $style")
       applyUserInterfaceStyle(style)
     } catch (e: Exception) {
-      // Ignore restore errors
+      OneKeyLog.warn("DeviceUtils", "Failed to restore UI style: ${e.message}")
     }
   }
 
@@ -283,6 +288,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
         saveFoldableStatus(true)
       }
       isDualScreenDeviceDetected = hasFolding
+      OneKeyLog.info("DeviceUtils", "Foldable detected: $hasFolding (${Build.MANUFACTURER} ${Build.MODEL})")
       return isDualScreenDeviceDetected!!
     }
     isDualScreenDeviceDetected = false
@@ -575,7 +581,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
       // Check device model name to determine if it's a foldable device
       return isFoldableDeviceByName()
     } catch (e: Exception) {
-      // WindowManager library not available or device doesn't support foldables
+      OneKeyLog.warn("DeviceUtils", "Foldable detection failed: ${e.message}")
       return false
     }
   }
@@ -697,9 +703,15 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
   }
 
   fun callSpanningChangedListeners(isSpanning: Boolean) {
-    // Create a snapshot to avoid ConcurrentModificationException when listeners modify the list during callbacks
-    for (listener in spanningChangedListeners.toList()) {
-      listener.callback(isSpanning)
+    // CopyOnWriteArrayList provides snapshot-based iteration that never throws
+    // ConcurrentModificationException, even if listeners are added/removed during iteration.
+    // Do NOT call .toList() here as it creates a regular ArrayList that is not thread-safe.
+    for (listener in spanningChangedListeners) {
+      try {
+        listener.callback(isSpanning)
+      } catch (e: Exception) {
+        OneKeyLog.error("DeviceUtils", "Error in spanning listener callback: ${e.message}")
+      }
     }
   }
 
@@ -747,7 +759,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
           layoutInfoConsumer!!
         )
       } catch (e: Exception) {
-        // Window tracking not supported on this device/API level, ignore
+        OneKeyLog.warn("DeviceUtils", "Window tracking setup failed: ${e.message}")
       }
     }
   }
@@ -780,6 +792,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
     
     // Emit event if spanning state changed
     if (wasSpanning != this.isSpanning) {
+      OneKeyLog.info("DeviceUtils", "Spanning state changed: $wasSpanning -> ${this.isSpanning}")
       this.callSpanningChangedListeners(this.isSpanning)
     }
   }
@@ -792,6 +805,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
       UserInterfaceStyle.DARK -> "dark"
       UserInterfaceStyle.UNSPECIFIED -> "unspecified"
     }
+    OneKeyLog.info("DeviceUtils", "Set UI style: $styleString")
     try {
       val context = NitroModules.applicationContext
       if (context != null) {
@@ -819,7 +833,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
         val rootView = activity.window.decorView
         rootView.rootView.setBackgroundColor(Color.argb(alpha, red, green, blue))
       } catch (e: Exception) {
-        e.printStackTrace()
+        OneKeyLog.error("DeviceUtils", "Failed to change background color: ${e.message}")
       }
     }
   }

package/ios/ReactNativeDeviceUtils.swift

@@ -1,5 +1,6 @@
 import NitroModules
 import UIKit
+import ReactNativeNativeLogger
 
 class ReactNativeDeviceUtils: HybridReactNativeDeviceUtilsSpec {
 
@@ -12,8 +13,10 @@ class ReactNativeDeviceUtils: HybridReactNativeDeviceUtilsSpec {
 
     private func restoreUserInterfaceStyle() {
         guard let style = UserDefaults.standard.string(forKey: ReactNativeDeviceUtils.userInterfaceStyleKey) else {
+            OneKeyLog.debug("DeviceUtils", "No saved UI style found")
             return
         }
+        OneKeyLog.info("DeviceUtils", "Restored UI style: \(style)")
         applyUserInterfaceStyle(style)
     }
 
@@ -70,6 +73,7 @@ class ReactNativeDeviceUtils: HybridReactNativeDeviceUtilsSpec {
     
     
     public func setUserInterfaceStyle(style: UserInterfaceStyle) throws -> Void {
+        OneKeyLog.info("DeviceUtils", "Set UI style: \(style.stringValue)")
         UserDefaults.standard.set(style.stringValue, forKey: ReactNativeDeviceUtils.userInterfaceStyleKey)
         applyUserInterfaceStyle(style.stringValue)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-device-utils",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "react-native-device-utils",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",