160912

Fix common editor URL_LOCAL refresh issue.

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,86 +3,6 @@
    type = "0"
    version = "2.0">
    <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/contact/CustomerInfoViewController.m"
-            timestampString = "494237092.613344"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "293"
-            endingLineNumber = "293"
-            landmarkName = "-viewDidLoad"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494237119.629828"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "113"
-            endingLineNumber = "113"
-            landmarkName = "+uploadFile:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494237120.831894"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
-            landmarkName = "+uploadFile:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494237762.517167"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "103"
-            endingLineNumber = "103"
-            landmarkName = "+uploadFile:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494237763.304923"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "102"
-            endingLineNumber = "102"
-            landmarkName = "+uploadFile:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -90,12 +10,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/CommonEditor/CommonEditorViewController.m"
-            timestampString = "494306666.554826"
+            timestampString = "495341735.232258"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4639"
-            endingLineNumber = "4639"
-            landmarkName = "-tableView:willSelectRowAtIndexPath:"
+            startingLineNumber = "3107"
+            endingLineNumber = "3107"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -105,157 +25,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494839298.810392"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4699"
-            endingLineNumber = "4699"
-            landmarkName = "+offline_saveContact:update:isCustomer:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494839298.810392"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4920"
-            endingLineNumber = "4920"
-            landmarkName = "+offline_editContact:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494316593.354454"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "791"
-            endingLineNumber = "791"
-            landmarkName = "+offline_wishlist:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "494318657.25787"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1705"
-            endingLineNumber = "1705"
-            landmarkName = "+add_toCart_byName:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/SyncControlPanelViewController.m"
-            timestampString = "494322326.101264"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "127"
-            endingLineNumber = "127"
-            landmarkName = "-onSendlogClick:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494323983.666269"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2027"
-            endingLineNumber = "2027"
-            landmarkName = "+offline_editorder:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "494324657.225156"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1621"
-            endingLineNumber = "1621"
-            landmarkName = "+add_toCart:count:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494325030.214764"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2016"
-            endingLineNumber = "2016"
-            landmarkName = "+offline_createorder:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494839298.810392"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "8139"
-            endingLineNumber = "8139"
-            landmarkName = "+paymentInfoDic:db:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "494839298.810392"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "495341735.232258"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5823"
-            endingLineNumber = "5823"
-            landmarkName = "+offline_orderdetail:"
+            startingLineNumber = "3233"
+            endingLineNumber = "3233"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -265,13 +41,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/cart/CartViewController.m"
-            timestampString = "494582436.342054"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "495341735.232258"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "392"
-            endingLineNumber = "392"
-            landmarkName = "-imgbtnClick:"
+            startingLineNumber = "3281"
+            endingLineNumber = "3281"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -281,29 +57,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/SelectUploadOrderViewController.m"
-            timestampString = "494583453.342062"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "88"
-            endingLineNumber = "88"
-            landmarkName = "-uploadButtonClicked:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "494583526.836931"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "495341735.232258"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "775"
-            endingLineNumber = "775"
-            landmarkName = "-upload_offline:useInternalAddress:orderid:"
+            startingLineNumber = "3287"
+            endingLineNumber = "3287"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -313,13 +73,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "494906718.503454"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "495341735.232258"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1001"
-            endingLineNumber = "1001"
-            landmarkName = "-check_offline:useInternalAddress:parentvc:"
+            startingLineNumber = "3377"
+            endingLineNumber = "3377"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -329,13 +89,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/SelectUploadOrderViewController.m"
-            timestampString = "494584792.049233"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "495339935.336482"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "97"
-            endingLineNumber = "97"
-            landmarkName = "-uploadButtonClicked:"
+            startingLineNumber = "397"
+            endingLineNumber = "397"
+            landmarkName = "-fillData"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -345,29 +105,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "494585062.42312"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "852"
-            endingLineNumber = "852"
-            landmarkName = "-upload_offline:useInternalAddress:orderid:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "494585833.476943"
+            filePath = "common/CommonEditor/CommonEditorViewController.m"
+            timestampString = "495341746.858184"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "850"
-            endingLineNumber = "850"
-            landmarkName = "-upload_offline:useInternalAddress:orderid:"
+            startingLineNumber = "3232"
+            endingLineNumber = "3232"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.h

@@ -80,5 +80,7 @@
 
 - (void)start_urgency_timer;
 - (void)cancel_urgency_timer;
-
+//URL_LOCAL 表单填充函数
+- (void) request_fill;
+@property (strong,nonatomic) NSMutableDictionary* data_init;
 @end

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -94,6 +94,10 @@
         // Custom initialization
     }
     return self;
+}
+- (void) request_fill
+{
+    
 }
 -(void) viewWillAppear:(BOOL)animated
 {
@@ -935,9 +939,14 @@
     else
     {
         
+      //  NSData* json =[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:self.request_url ofType:@"json" ]];
         NSData* json =[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:self.request_url ofType:@"json" ]];
         NSError *error=nil;
-        self.content_data_control=[self translate_json:[NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error] changed:self.changed_data];
+        self.content_data_download = [[NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error] mutableCopy];
+
+        [self request_fill];
+        
+        self.content_data_control=[self translate_json:self.content_data_download changed:self.changed_data];
         [self.editorTable reloadData];
         
         //                NSString * ttt=[self.content_data valueForKey:@"title"] ;

RedAnt ERP Mobile/common/Functions/contact/ContactAdvanceSearchViewController.h

@@ -10,5 +10,5 @@
 #import "CommonEditorViewController.h"
 @interface ContactAdvanceSearchViewController : CommonEditorViewController
 
-@property (strong,nonatomic) NSMutableDictionary* data_init;
+
 @end

RedAnt ERP Mobile/common/Functions/contact/ContactAdvanceSearchViewController.m

@@ -96,6 +96,10 @@
 }
 - (IBAction)onCloseClick:(id)sender {
     [self dismissViewControllerAnimated:true completion:nil];
+}
+-(void) request_fill
+{
+    
 }
 - (void) fillData
 {

RedAnt ERP Mobile/common/Functions/contact/CustomerInfoViewController.h

@@ -13,7 +13,7 @@
 
 @property (strong,nonatomic) NSString* contactId;
 
-@property (strong,nonatomic) NSMutableDictionary* data_init;
+
 
 @property (strong,nonatomic) NSString* rightbtn_title;
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *right_btn;

RedAnt ERP Mobile/common/Functions/contact/CustomerInfoViewController.m

@@ -290,33 +290,7 @@
     
     if (self.data_init==nil) {
         
-         UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Loading Contact information"];
-        
-        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-            
-            NSDictionary* editor_json = [iSalesNetwork request_CustomerInfo:self.contactId];
-            
-            dispatch_async(dispatch_get_main_queue(), ^{
-                
-                [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
-                
-                if([[editor_json valueForKey:@"result"] intValue]==2)
-                {
-                    self.data_init = [[editor_json objectForKey:@"customerInfo" ] mutableCopy];
-                    
-                    [self fillData];
-                    self.btn_assign.enabled=true;
-                    
-                }
-                else
-                {
-                    [RAUtils message_alert:[editor_json valueForKey:@"err_msg"] title:@"Loading Contact Information" controller:self] ;
-                    self.btn_assign.enabled=false;
-                }
-                
-                
-            });
-        });
+        [self request_fill];
     }
     else
     {
@@ -388,6 +362,36 @@
     //        ;
     //    }];
 }
+-(void) request_fill
+{
+    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Loading Contact information"];
+    
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        
+        NSDictionary* editor_json = [iSalesNetwork request_CustomerInfo:self.contactId];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            
+            [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+            
+            if([[editor_json valueForKey:@"result"] intValue]==2)
+            {
+                self.data_init = [[editor_json objectForKey:@"customerInfo" ] mutableCopy];
+                
+                [self fillData];
+                self.btn_assign.enabled=true;
+                
+            }
+            else
+            {
+                [RAUtils message_alert:[editor_json valueForKey:@"err_msg"] title:@"Loading Contact Information" controller:self] ;
+                self.btn_assign.enabled=false;
+            }
+            
+            
+        });
+    });
+}
 - (void) fillData
 {
     int section_count=[[self.content_data_download valueForKey:@"section_count"] intValue];