Leon 1 jaar geleden
bovenliggende
commit
4e1a2cec91

+ 4 - 8
ios/hola.xcodeproj/project.pbxproj

@@ -14,7 +14,6 @@
 		35319C272B2773AB00471ACA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 35319C262B2773AB00471ACA /* libz.tbd */; };
 		35319C292B2773B600471ACA /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 35319C282B2773B600471ACA /* libresolv.tbd */; };
 		35319C2B2B2773BE00471ACA /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35319C2A2B2773BE00471ACA /* UserNotifications.framework */; };
-		3582DF402C29207800276327 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3582DF3F2C29207800276327 /* StoreKit.framework */; };
 		35B0D6E02B4D4EE10059F156 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35B0D6DF2B4D4EE10059F156 /* AppDelegate.mm */; };
 		35B0D6EB2B5B872F0059F156 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 35B0D6E92B5B872F0059F156 /* assets */; };
 		35B0D6ED2B5B8D360059F156 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 35B0D6EC2B5B8D360059F156 /* main.jsbundle */; };
@@ -49,7 +48,6 @@
 		35319C262B2773AB00471ACA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		35319C282B2773B600471ACA /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
 		35319C2A2B2773BE00471ACA /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
-		3582DF3F2C29207800276327 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		35B0D6DE2B4D4EE10059F156 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		35B0D6DF2B4D4EE10059F156 /* AppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; };
 		35B0D6E12B4D58540059F156 /* hola.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = hola.entitlements; path = hola/hola.entitlements; sourceTree = "<group>"; };
@@ -83,7 +81,6 @@
 			files = (
 				1616AFC2E937999F0F295448 /* libPods-hola.a in Frameworks */,
 				35319C2B2B2773BE00471ACA /* UserNotifications.framework in Frameworks */,
-				3582DF402C29207800276327 /* StoreKit.framework in Frameworks */,
 				35319C292B2773B600471ACA /* libresolv.tbd in Frameworks */,
 				35319C272B2773AB00471ACA /* libz.tbd in Frameworks */,
 			);
@@ -131,7 +128,6 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				3582DF3F2C29207800276327 /* StoreKit.framework */,
 				35319C2A2B2773BE00471ACA /* UserNotifications.framework */,
 				35319C282B2773B600471ACA /* libresolv.tbd */,
 				35319C262B2773AB00471ACA /* libz.tbd */,
@@ -576,7 +572,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 96;
+				CURRENT_PROJECT_VERSION = 97;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hola/Info.plist;
@@ -584,7 +580,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -609,14 +605,14 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 96;
+				CURRENT_PROJECT_VERSION = 97;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				INFOPLIST_FILE = hola/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 1 - 1
ios/hola/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>96</string>
+	<string>97</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

File diff suppressed because it is too large
+ 1 - 1
ios/main.jsbundle


+ 1 - 1
src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -194,7 +194,7 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
                 setShowCancel(false)
                 setConfirmText(t('feature.check_access.non_access.btn'))
             }
-            else if (preStatus == 'NOT_QUALIFIED' && (currentStatus == 'PROVISIONAL_QUALIFIED' || currentStatus == 'QUALIFIED_UNTIL_EXPIRE')) {
+            else if (preStatus == 'NOT_QUALIFIED' && (currentStatus == 'PROVISIONAL_QUALIFIED' || currentStatus == 'QUALIFIED_UNTIL_EXPIRE') && global.ring.current_record.scenario != 'FAST_SLEEP') {
 
                 const { streak_fast_current } = acccessData.current.qualification.condition
                 const reason = t('feature.check_access.gain_access.reason', { day: streak_fast_current })

+ 1 - 0
src/features/trackTimeDuration/components/IndexConsoleMuti.tsx

@@ -267,6 +267,7 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                 fast
             }
         }
+        params.showAlert = true
         batchClocks(params).then(res => {
             getLocalPush()
             global.indexPageRefresh()

+ 5 - 0
src/pages/store/product_list.tsx

@@ -131,6 +131,11 @@ export default function ProductList() {
         }
     }
 
+    if (packages.length == 0)
+        return <View style={{ flex: 1, position: 'relative', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
+            <AtActivityIndicator size={40} color="#fff" />
+        </View>
+
     return <View style={{ flex: 1, position: 'relative' }}>
         <View style={{ height: 40 }} />
         {

Some files were not shown because too many files changed in this diff