Преглед изворни кода

Ra TradeFiling 1.18 iOS 18 compatible fix

Ray Zhang пре 9 месеци
родитељ
комит
3f361dc59d

+ 7 - 11
RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -1633,7 +1633,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1540;
+				LastUpgradeCheck = 1630;
 				TargetAttributes = {
 					3C0CB330255E56BF00718A03 = {
 						CreatedOnToolsVersion = 12.1;
@@ -2065,6 +2065,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -2126,6 +2127,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -2151,8 +2153,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50030;
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				CURRENT_PROJECT_VERSION = 56280;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -2160,7 +2161,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.16;
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -2173,8 +2174,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 50030;
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				CURRENT_PROJECT_VERSION = 56280;
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -2182,7 +2182,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.16;
+				MARKETING_VERSION = 1.18;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -2194,7 +2194,6 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "RA TradeFilingTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2214,7 +2213,6 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "RA TradeFilingTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2233,7 +2231,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "RA TradeFilingUITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2251,7 +2248,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "RA TradeFilingUITests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 17
RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.m

@@ -221,23 +221,7 @@
 + (void)request_fastdownload:(nullable NSMutableDictionary *)params url:(NSString *)url completionHandler:(resultHandler)result
 {
     
-#ifdef test_server
-//    url=URL_REQUEST_RECORDS;
-//    params[@"prefix"]=URL_REQUEST_RECORDS;
-#endif
-    
-//    if(method.length==0)
-//        method=@"POST";
-//
-//    if(path.length==0)
-//        path=NSTemporaryDirectory();
-    
-//
-//    (NSString*) url parameters:(NSMutableDictionary *) params  err_record_url:(NSString* )recorder_url offset:(NSUInteger)offset method:(NSString *)method storein:(NSString *)path progressHandler:(progressHandler)progressHandler completionHandler:(resultHandler)result;
-    
-//    params = [self prepare_addtional_params:params];
-//    [self request_file:url parameters:params err_record_url:err_record offset:offset method:method storein:path progressHandler:progressHandler completionHandler:result];
-    
+
     [self request_file_fast:url parameters:params completionHandler:result];
     
 }

+ 2 - 2
RA TradeFiling/RA TradeFiling/Home/RAHomeViewController+HomeTableDelegate.m

@@ -26,7 +26,7 @@
         return 30;
      if(model.type>4)
         return 78;
-    else if(model.type==DashResultTypeeManifestPending)
+    else if(model.type==ResultTypeeManifest)
         return 85;
     else
         return 62;
@@ -56,7 +56,7 @@
     
     ResultBaseModel *mode = [self dashModelForIndexPath:indexPath];
     
-    if(mode.type==DashResultTypeEmpty)
+    if(mode.type==ResultTypeEmpty)
         return;
     [self handleRowAction:indexPath];
 //

+ 1 - 1
RA TradeFiling/RA TradeFiling/config.h

@@ -37,7 +37,7 @@
 #define URL_HOME                BASE_URL@"/mobileMain.php"
 #define URL_SEARCH_RESULT       BASE_URL@"/resultMobile.php"
 
-#define URL_PRIVACY             @"http://united-us.net/privacy.html"
+#define URL_PRIVACY             @"https://www.united-us.net/privacy.html"
 #define URL_ERR_LOG             @""
 #define URL_REQUEST_DETAIL      BASE_URL@"/resultMobile.php"
 

+ 2 - 0
common/WK PDF+Web/WebViewController.h

@@ -30,4 +30,6 @@
 
 
 
+@property  (nonatomic,assign) UIColor* mumcolor;
+
 @end

+ 2 - 0
common/WK PDF+Web/WebViewController.m

@@ -62,6 +62,8 @@
  
     
     [self loadcontent];
+    if(self.mumcolor)
+        self.mum.color = self.mumcolor;
 }
 - (void)onBackClick:(UIButton *)sender {
     /*