leon преди 1 година
родител
ревизия
c109e22d23
променени са 2 файла, в които са добавени 18 реда и са изтрити 16 реда
  1. 3 3
      ios/hola.xcodeproj/project.pbxproj
  2. 15 13
      src/features/trackTimeDuration/components/DayNightCard.tsx

+ 3 - 3
ios/hola.xcodeproj/project.pbxproj

@@ -75,10 +75,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1616AFC2E937999F0F295448 /* libPods-hola.a in Frameworks */,
 				35319C2B2B2773BE00471ACA /* UserNotifications.framework in Frameworks */,
 				35319C292B2773B600471ACA /* libresolv.tbd in Frameworks */,
 				35319C272B2773AB00471ACA /* libz.tbd in Frameworks */,
-				1616AFC2E937999F0F295448 /* libPods-hola.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -602,8 +602,8 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				EXCLUDED_ARCHS = "arm64 arm64e";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				EXCLUDED_ARCHS = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;

+ 15 - 13
src/features/trackTimeDuration/components/DayNightCard.tsx

@@ -1,4 +1,4 @@
-import { PageContainer, Switch, Text, View,Image } from '@tarojs/components'
+import { PageContainer, Switch, Text, View, Image } from '@tarojs/components'
 import './DayNightCard.scss'
 import { ColorType } from '@/context/themes/color'
 import { useEffect, useState } from 'react'
@@ -709,8 +709,8 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
         //`Yesterday ${sunsetTime} - Today ${sunriseTmrTime}`
     }
 
-    function getSunsetTime(){
-        if (props.isNight){
+    function getSunsetTime() {
+        if (props.isNight) {
             if (!authInfo || !(authInfo as any).lat) {
                 if (new Date().getHours() >= 6) {
                     return `${t('feature.day_night.tonight')} ${sunsetTime}`
@@ -739,8 +739,8 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
         return `${t('feature.day_night.tomorrow')} ${sunriseTime.substring(0, 5)}`
     }
 
-    function getSunriseTime(){
-        if (props.isNight){
+    function getSunriseTime() {
+        if (props.isNight) {
             if (!authInfo || !(authInfo as any).lat) {
                 if (new Date().getHours() >= 6) {
                     return `${t('feature.day_night.tomorrow_morning')} ${sunriseTmrTime}`
@@ -960,15 +960,17 @@ export default function DayNightCard(props: { isNight: boolean, count: number })
                 <Text className='day_night_desc'>{props.isNight ? nightDurationDesc1() : dayDurationDesc1()}</Text>
 
                 <View className='daynightsummary'>
-                    <View style={{display:'flex',flexDirection:'column'}}>
-                        <Image className='sunicon' src={require(props.isNight?'@assets/images/sunset.png':'@assets/images/sunrise.png')}/>
-                        <Image className='sunicon' src={require(props.isNight?'@assets/images/sunrise.png':'@assets/images/sunset.png')}/>
+                    <View style={{ display: 'flex', flexDirection: 'column' }}>
+                        <Image className='sunicon' src={props.isNight ? require('@assets/images/sunset.png') :
+                            require('@assets/images/sunrise.png')} />
+                        <Image className='sunicon' src={props.isNight ? require('@assets/images/sunrise.png') :
+                            require('@assets/images/sunset.png')} />
                     </View>
-                    <View style={{display:'flex',flexDirection:'column'}}>
-                        <Text className='duration_title2'>{props.isNight?'日落':'日出'}</Text>
-                        <Text style={{color:props.isNight?ColorType.night:ColorType.day}}>{props.isNight?getSunsetTime():getSunriseTime()}</Text>
-                        <Text className='duration_title2'>{!props.isNight?'日落':'日出'}</Text>
-                        <Text style={{color:!props.isNight?ColorType.night:ColorType.day}}>{!props.isNight?getSunsetTime():getSunriseTime()}</Text>
+                    <View style={{ display: 'flex', flexDirection: 'column' }}>
+                        <Text className='duration_title2'>{props.isNight ? '日落' : '日出'}</Text>
+                        <Text style={{ color: props.isNight ? ColorType.night : ColorType.day }}>{props.isNight ? getSunsetTime() : getSunriseTime()}</Text>
+                        <Text className='duration_title2'>{!props.isNight ? '日落' : '日出'}</Text>
+                        <Text style={{ color: !props.isNight ? ColorType.night : ColorType.day }}>{!props.isNight ? getSunsetTime() : getSunriseTime()}</Text>
                     </View>
                 </View>
                 {