fix(ios): delay of animationSet not working under new sync mechanism

Tencent · Jul 3, 2024 · a46cc65 · a46cc65
1 parent de85871
commit a46cc65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ios/sdk/module/animation2/HippyNextAnimationModule.m b/ios/sdk/module/animation2/HippyNextAnimationModule.m
@@ -465,7 +465,9 @@ - (void)animatorDidAnimate:(HPOPAnimator *)animator inCustomQueue:(dispatch_queu
             [strongSelf.groupAnimSyncLock unlock];
 
             NSMutableArray<id> *targetObjects = [NSMutableArray arrayWithCapacity:pendingAnims.count];
+            CFTimeInterval now = CACurrentMediaTime();
             for (HippyNextAnimation *anim in pendingAnims) {
+                anim.beginTime = now + anim.delayTime;
                 [targetObjects addObject:anim.targetObject];
             }
 

diff --git a/ios/sdk/module/netinfo/HippyNetInfoIntenal.m b/ios/sdk/module/netinfo/HippyNetInfoIntenal.m
@@ -87,8 +87,11 @@ @implementation HippyNetInfoIntenal
 
 static NSString *radioAccessNameIn(CTTelephonyNetworkInfo *networkInfo) {
     if (@available(iOS 13.0, *)) {
-        if (networkInfo.dataServiceIdentifier) {
-            return [networkInfo.serviceCurrentRadioAccessTechnology objectForKey:networkInfo.dataServiceIdentifier];
+        // CTTelephonyNetwork has some multi-threading problems for now
+        // https://developer.apple.com/forums/thread/683362
+        NSString *identifier = networkInfo.dataServiceIdentifier;
+        if (identifier) {
+            return [networkInfo.serviceCurrentRadioAccessTechnology objectForKey:identifier];
         }
         return nil;
     } else {