Explorar o código

Tradefiling 1.1

Ray Zhang %!s(int64=4) %!d(string=hai) anos
pai
achega
44d74e27ba

+ 2 - 2
RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -2121,7 +2121,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.09;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -2142,7 +2142,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.09;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

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


+ 16 - 128
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -7,177 +7,65 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "6EC792AC-05E8-4754-BBBE-F9C498B8E7C7"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../common/RAUtils.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "643"
-            endingLineNumber = "643"
-            landmarkName = "+message_alert:title:controller:action_handler:completion:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4A1DB9E7-4DAE-4235-8D3C-30A2FB24A2B5"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4104"
-            endingLineNumber = "4104"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6DCF7080-5EF4-4AC4-B345-B1E08A0CD371"
+            uuid = "52082639-9FEF-4DF1-8FD4-20882C7A5D10"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5109"
-            endingLineNumber = "5109"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            startingLineNumber = "1969"
+            endingLineNumber = "1969"
+            landmarkName = "-prepareReturn:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "0188260C-7F62-4C13-B105-E47D5A66ADAF"
+            uuid = "2403E0A0-8844-4F2E-AFDB-38B6F76002D4"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "457"
-            endingLineNumber = "457"
-            landmarkName = "-viewDidLoad"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "08697C7C-18AE-4F39-9CAA-13FA05E33035"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1428"
-            endingLineNumber = "1428"
-            landmarkName = "-refresh:discardDirty:"
+            startingLineNumber = "2921"
+            endingLineNumber = "2921"
+            landmarkName = "-returnValue:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "A00F5D5C-8D72-4C50-9DF1-93C01BEA323F"
+            uuid = "A5AE0142-730C-4A5C-B2D3-AC197FB26669"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2637"
-            endingLineNumber = "2637"
-            landmarkName = "-textfieldSetValue:value:"
+            startingLineNumber = "1975"
+            endingLineNumber = "1975"
+            landmarkName = "-prepareReturn:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "B0A22346-6C0A-4EFA-A4B3-8CCECE79AC2C"
+            uuid = "3C5120E5-9147-45A0-A634-10269C99E428"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2794"
-            endingLineNumber = "2794"
-            landmarkName = "-textfieldSetValue:value:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "69F0C882-40F0-4FC0-BE1D-7BF3563DF46A"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "310"
-            endingLineNumber = "310"
-            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E8BADCBC-CF79-4494-9DD8-27254E3A28B8"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "RA TradeFiling/TFNavigationController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "145"
-            endingLineNumber = "145"
-            landmarkName = "-receiveHandleKickoutNotification:"
+            startingLineNumber = "1978"
+            endingLineNumber = "1978"
+            landmarkName = "-prepareReturn:"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "E8BADCBC-CF79-4494-9DD8-27254E3A28B8 - cb403cc1acc8b3eb"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[TFNavigationController receiveHandleKickoutNotification:]"
-                  moduleName = "RA TradeFiling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/RA%20TradeFiling/RA%20TradeFiling/TFNavigationController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "145"
-                  endingLineNumber = "145"
-                  offsetFromSymbolStart = "263">
-               </Location>
-               <Location
-                  uuid = "E8BADCBC-CF79-4494-9DD8-27254E3A28B8 - 1dd472414e4612db"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__59-[TFNavigationController receiveHandleKickoutNotification:]_block_invoke"
-                  moduleName = "RA TradeFiling"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/RA%20TradeFiling/RA%20TradeFiling/TFNavigationController.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "147"
-                  endingLineNumber = "147"
-                  offsetFromSymbolStart = "48">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

+ 10 - 9
common/customUI/commoneditor/CommonEditorViewController.m

@@ -288,6 +288,7 @@ if(!self.alert.isBeingDismissed)
 
 -(void)manually_refresh
 {
+    return;
     UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
     reF.attributedTitle = [[NSAttributedString alloc]initWithString:@"Refreshing"];
     
@@ -394,15 +395,15 @@ if(!self.alert.isBeingDismissed)
     if(self.loading_title==nil)
         self.loading_title = @"Loading...";
     
-    UIRefreshControl *ref = [[UIRefreshControl alloc]init];
-    ref.tag = 200 ;
-    ref.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
-    ref.tintColor = [UIColor colorWithRed:0.10 green:0.68 blue:0.94 alpha:0.7];
-    //    ref.hidden = true;
-    [ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged];
-    
-    if(!self.disable_dropdown_refresh)
-        [self.editorTable addSubview:ref];
+//    UIRefreshControl *ref = [[UIRefreshControl alloc]init];
+//    ref.tag = 200 ;
+//    ref.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
+//    ref.tintColor = [UIColor colorWithRed:0.10 green:0.68 blue:0.94 alpha:0.7];
+//    //    ref.hidden = true;
+//    [ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged];
+//    
+//    if(!self.disable_dropdown_refresh)
+//        [self.editorTable addSubview:ref];
     
     self.level = -1;