Automatically refresh home after compay is set -- compay 设置后自动刷新home resolve: #31

另外修复上行参数没有company的bug

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -42,8 +42,8 @@
             filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "221"
-            endingLineNumber = "221"
+            startingLineNumber = "223"
+            endingLineNumber = "223"
             landmarkName = "-loadFunctions"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,8 +74,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "221"
-            endingLineNumber = "221"
+            startingLineNumber = "227"
+            endingLineNumber = "227"
             landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
             landmarkType = "7">
             <Locations>
@@ -122,8 +122,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "717"
-            endingLineNumber = "717"
+            startingLineNumber = "721"
+            endingLineNumber = "721"
             landmarkName = "-loadData"
             landmarkType = "7">
          </BreakpointContent>
@@ -234,8 +234,8 @@
             filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "374"
-            endingLineNumber = "374"
+            startingLineNumber = "376"
+            endingLineNumber = "376"
             landmarkName = "-collectionView:didSelectItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -250,8 +250,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "973"
-            endingLineNumber = "973"
+            startingLineNumber = "977"
+            endingLineNumber = "977"
             landmarkName = "-showMoreOrderForSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -282,9 +282,9 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "663"
-            endingLineNumber = "663"
-            landmarkName = "-dashModelForIndexPath:"
+            startingLineNumber = "667"
+            endingLineNumber = "667"
+            landmarkName = "-titleForSection:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -762,8 +762,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "223"
-            endingLineNumber = "223"
+            startingLineNumber = "229"
+            endingLineNumber = "229"
             landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
             landmarkType = "7">
          </BreakpointContent>
@@ -906,8 +906,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "578"
-            endingLineNumber = "578"
+            startingLineNumber = "582"
+            endingLineNumber = "582"
             landmarkName = "-_updateUploadItem:withUploadCount:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1116,7 +1116,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "95"
                   endingLineNumber = "95"
-                  offsetFromSymbolStart = "1022">
+                  offsetFromSymbolStart = "852">
                </Location>
                <Location
                   uuid = "1A82154B-E529-468C-9650-0F348DFF0677 - 845561727e52cadd"
@@ -1131,10 +1131,90 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "97"
                   endingLineNumber = "97"
-                  offsetFromSymbolStart = "54">
+                  offsetFromSymbolStart = "100">
                </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D02C4B98-42BF-444A-9456-A83EF33FE98D"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "473"
+            endingLineNumber = "473"
+            landmarkName = "RADataProvider"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "31F87A88-392F-4266-BB93-CA0A3B45CDED"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "171"
+            endingLineNumber = "171"
+            landmarkName = "+prepare_additional_params:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EBD7CFC4-0D2B-4067-935E-F8D41DF05294"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "208"
+            endingLineNumber = "208"
+            landmarkName = "+prepare_additional_params:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B548D210-515F-4276-890D-D16A35328FFB"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "60"
+            endingLineNumber = "60"
+            landmarkName = "-onCompanyBtnClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "73B279EC-783F-4487-BF2D-6F0826FBC536"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/CompanySelectViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            landmarkName = "-onSetClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.m

@@ -133,7 +133,7 @@
 + (void)request_retrievepassword: (NSString*)user  email:(NSString*)email completionHandler:(resultHandler)result
 {
     NSMutableDictionary* params = [NSMutableDictionary new];
-    
+    params[@"action"]=@"retrievePassword";
     params[@"user"]=user;
     params[@"email"]=email;
     [self request_interface:URL_RETRIEVE_PASS parameters:params err_record_url:nil completionHandler:result retry:0];
@@ -178,6 +178,8 @@
 //    if(appDelegate.password!=nil&& params[@"pwd"] == nil)
 //        [params setValue:[AESCrypt AES128Encrypt:appDelegate.password key:@"Usai2010"] forKey:@"pwd"];
     
+    
+    
     if(RASingleton.sharedInstance.user!=nil && params[@"user"] == nil)
         [params setValue:RASingleton.sharedInstance.user  forKey:@"user"];
     if(RASingleton.sharedInstance.password!=nil&& params[@"password"] == nil)
@@ -199,6 +201,10 @@
     [params setValue:uuid.UUIDString forKey:@"deviceid"];
 #endif
     
+    
+    if(RASingleton.sharedInstance.companylist.count>0)
+        params[@"company"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"id"];
+    
     params[@"os"]=@"iOS";
     return params;
 }

RA TradeFiling/RA TradeFiling/DataProvider/RADataProvider.m

@@ -467,50 +467,50 @@
      
 }
 //
-+(NSMutableDictionary*) prepare_additional_params:(NSMutableDictionary* ) params
-{
-    
-    if (params == nil) {
-        params = [NSMutableDictionary dictionary];
-    }
-    
-    NSString *user = params[@"user"];
-    if (!user) {
-        user = RASingleton.sharedInstance.user;
-        if (user) {
-            params[@"user"] = user;
-        }
-    }
-    
-    NSString *password = params[@"password"];
-    if (!password) {
-        password = RASingleton.sharedInstance.password;
-        if (password) {
-            params[@"password"] = password;
-        }
-    }
-    
-    [params setObject:@"iOS" forKey:@"platform"];
-    
-    NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
-    NSString* short_version =[infoDict objectForKey:@"CFBundleShortVersionString"];
-    [params setValue:short_version forKey:@"app_short_ver"];
-    
-    NSString *localeLanguageCode = [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode];
-    [params setValue:localeLanguageCode forKey:@"language"];
-    
-#if TARGET_IPHONE_SIMULATOR//模拟器
-    [params setValue:@"simulator_uuid" forKey:@"deviceid"];
-#elif TARGET_OS_IPHONE//真机
-    UIDevice * dev = [UIDevice currentDevice];
-    NSUUID* uuid =dev.identifierForVendor;
-    [params setValue:uuid.UUIDString forKey:@"deviceid"];
-#endif
-    
-    if(RASingleton.sharedInstance.companyid>0)
-        params[@"company_id"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"id"];
-    return params;
-}
+//+(NSMutableDictionary*) prepare_additional_params:(NSMutableDictionary* ) params
+//{
+//    
+//    if (params == nil) {
+//        params = [NSMutableDictionary dictionary];
+//    }
+//    
+//    NSString *user = params[@"user"];
+//    if (!user) {
+//        user = RASingleton.sharedInstance.user;
+//        if (user) {
+//            params[@"user"] = user;
+//        }
+//    }
+//    
+//    NSString *password = params[@"password"];
+//    if (!password) {
+//        password = RASingleton.sharedInstance.password;
+//        if (password) {
+//            params[@"password"] = password;
+//        }
+//    }
+//    
+//    [params setObject:@"iOS" forKey:@"platform"];
+//    
+//    NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
+//    NSString* short_version =[infoDict objectForKey:@"CFBundleShortVersionString"];
+//    [params setValue:short_version forKey:@"app_short_ver"];
+//    
+//    NSString *localeLanguageCode = [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode];
+//    [params setValue:localeLanguageCode forKey:@"language"];
+//    
+//#if TARGET_IPHONE_SIMULATOR//模拟器
+//    [params setValue:@"simulator_uuid" forKey:@"deviceid"];
+//#elif TARGET_OS_IPHONE//真机
+//    UIDevice * dev = [UIDevice currentDevice];
+//    NSUUID* uuid =dev.identifierForVendor;
+//    [params setValue:uuid.UUIDString forKey:@"deviceid"];
+//#endif
+//    
+//    if(RASingleton.sharedInstance.companylist.count>0)
+//        params[@"company_id"]= RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"id"];
+//    return params;
+//}
 //
 //+(NSData*)get_json : (NSString*) url parameters:(NSMutableDictionary *) params file:(NSString *) file //delegate:(id < NSURLConnectionDelegate >)delegate
 //{

RA TradeFiling/RA TradeFiling/Home/CompanySelectViewController.m

@@ -31,11 +31,11 @@
 
 - (IBAction)onSetClick:(id)sender {
     int selected=(int)self.tableView.indexPathForSelectedRow.row;
-    int selected_cid = [RASingleton.sharedInstance.companylist[selected][@"id"] intValue];
+//    int selected_cid = [RASingleton.sharedInstance.companylist[selected][@"id"] intValue];
     
     if(RASingleton.sharedInstance.companyid!=selected)
     {
-        RASingleton.sharedInstance.companyid=selected_cid;
+        RASingleton.sharedInstance.companyid=selected;
         if(self.onSet)
             self.onSet();
         [self.navigationController popViewControllerAnimated:true];

RA TradeFiling/RA TradeFiling/Home/RAHomeHeaderView.h

@@ -36,7 +36,7 @@
 
 @property (nonatomic , copy) void (^onSetFunctions)(void);
 
-
+@property (nonatomic , copy) void (^onSetCompany)(void);
 @property (nonatomic,weak) id<RAHomeHeaderDelegate> delegate;
 
 + (instancetype)homeHeader;

RA TradeFiling/RA TradeFiling/Home/RAHomeHeaderView.m

@@ -58,6 +58,8 @@
     CompanySelectViewController *vc = [[UIStoryboard storyboardWithName:@"Home" bundle:nil] instantiateViewControllerWithIdentifier:@"CompanySelectViewController"];
     vc.onSet=^(void){
         [self.btnCompany setTitle:RASingleton.sharedInstance.companylist[RASingleton.sharedInstance.companyid][@"name"] forState:UIControlStateNormal];
+        if(self.onSetCompany)
+            self.onSetCompany();
     };
 //    searchViewController.subtype = item[@"sub_type"];
 //        searchViewController.type = @"search";

RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -367,6 +367,10 @@
     {
         [self.tableView reloadData];
     };
+    self.headerView.onSetCompany=^(void)
+    {
+        [self loadData];
+    };
     self.headerView.delegate = self;
     self.tableView.tableHeaderView = self.headerView;
     

RA TradeFiling/RA TradeFiling/Info.plist

@@ -36,6 +36,11 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

RA TradeFiling/RA TradeFiling/config.h

@@ -21,7 +21,7 @@
 #ifdef test_server
     #define BASE_URL @"http://192.168.0.149/ACE_ISF_NEW"
 #else
-    #define BASE_URL @"https://ra.apexshipping.com"
+    #define BASE_URL @"https://ra.united-us.net/doc/bk"
 #endif
 
 
@@ -37,7 +37,7 @@
 #define URL_HOME                BASE_URL@"/mobileMain.php"
 #define URL_SEARCH_RESULT       BASE_URL@"/resultMobile.php"
 
-#define URL_PRIVACY             BASE_URL@"/t/privacyPolicy.html"
+#define URL_PRIVACY             BASE_URL@"/privacyPolicy.html"
 #define URL_ERR_LOG             @""
 #define URL_REQUEST_DETAIL      BASE_URL@"/resultMobile.php"