Quellcode durchsuchen

Editor nested calls will crash when the data source is a real background -- editor 嵌套调用当数据源是真实后台时会闪退。(issue70: #14207)
Modify the general network access interface and add more error information feedback -- 对通用网络访问接口进行修改,增加更多的错误信息反馈(issue70: #14208)

Ray Zhang vor 5 Jahren
Ursprung
Commit
4289e0c8f4

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

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3C02E833264E5CB5008DA531 /* EnumSelectOnlineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C02E832264E5CB5008DA531 /* EnumSelectOnlineViewController.m */; };
 		3C02E836264E610E008DA531 /* enum_cadedate.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C02E835264E610E008DA531 /* enum_cadedate.json */; };
 		3C02E83826539642008DA531 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C02E83726539642008DA531 /* wkweb.storyboard */; };
+		3C02E83B2653B488008DA531 /* EnumSelectOnlineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C02E8392653B487008DA531 /* EnumSelectOnlineViewController.m */; };
 		3C0CB336255E56BF00718A03 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0CB335255E56BF00718A03 /* AppDelegate.m */; };
 		3C0CB339255E56BF00718A03 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0CB338255E56BF00718A03 /* SceneDelegate.m */; };
 		3C0CB33C255E56BF00718A03 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0CB33B255E56BF00718A03 /* ViewController.m */; };
@@ -283,11 +283,11 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		3C02E831264E5CB5008DA531 /* EnumSelectOnlineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnumSelectOnlineViewController.h; sourceTree = "<group>"; };
-		3C02E832264E5CB5008DA531 /* EnumSelectOnlineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EnumSelectOnlineViewController.m; sourceTree = "<group>"; };
 		3C02E834264E5FAC008DA531 /* EnumSelectDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EnumSelectDelegate.h; path = ../../common/customUI/commoneditor/EnumSelectDelegate.h; sourceTree = "<group>"; };
 		3C02E835264E610E008DA531 /* enum_cadedate.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = enum_cadedate.json; sourceTree = "<group>"; };
 		3C02E83726539642008DA531 /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
+		3C02E8392653B487008DA531 /* EnumSelectOnlineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EnumSelectOnlineViewController.m; path = ../../common/customUI/commoneditor/EnumSelectOnlineViewController.m; sourceTree = "<group>"; };
+		3C02E83A2653B487008DA531 /* EnumSelectOnlineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EnumSelectOnlineViewController.h; path = ../../common/customUI/commoneditor/EnumSelectOnlineViewController.h; sourceTree = "<group>"; };
 		3C0CB331255E56BF00718A03 /* RA TradeFiling.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RA TradeFiling.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3C0CB334255E56BF00718A03 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		3C0CB335255E56BF00718A03 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -1439,6 +1439,8 @@
 				3C2C27B52636657C009460F5 /* EnumModel.h */,
 				3C2C27BA2636657C009460F5 /* EnumModel.m */,
 				3C2C27B82636657C009460F5 /* EnumSelectAndSort.storyboard */,
+				3C02E83A2653B487008DA531 /* EnumSelectOnlineViewController.h */,
+				3C02E8392653B487008DA531 /* EnumSelectOnlineViewController.m */,
 				3C2C27B72636657C009460F5 /* EnumSelectAndSortCell.h */,
 				3C2C27BB2636657C009460F5 /* EnumSelectAndSortCell.m */,
 				3C2C27B62636657C009460F5 /* EnumSelectAndSortViewController.h */,
@@ -1448,8 +1450,6 @@
 				3C02E834264E5FAC008DA531 /* EnumSelectDelegate.h */,
 				3C2C27AE2636652F009460F5 /* EnumSelectViewController.h */,
 				3C2C27AF2636652F009460F5 /* EnumSelectViewController.m */,
-				3C02E831264E5CB5008DA531 /* EnumSelectOnlineViewController.h */,
-				3C02E832264E5CB5008DA531 /* EnumSelectOnlineViewController.m */,
 				3C2C279E263663FA009460F5 /* CustomIOSAlertView.h */,
 				3C2C279D263663FA009460F5 /* CustomIOSAlertView.m */,
 				3C2C2797263663B1009460F5 /* StrikethroughLabel.h */,
@@ -1908,7 +1908,7 @@
 				3C2C27E6263666F2009460F5 /* PhotoPreviewCell.m in Sources */,
 				3C2C2799263663B1009460F5 /* StrikethroughLabel.m in Sources */,
 				3C452F9825BE97430035AF5F /* HomeDashACEM1CellE.m in Sources */,
-				3C02E833264E5CB5008DA531 /* EnumSelectOnlineViewController.m in Sources */,
+				3C02E83B2653B488008DA531 /* EnumSelectOnlineViewController.m in Sources */,
 				3C2C26EC2635578F009460F5 /* CommonEditorCellAction.m in Sources */,
 				3C76708825A6DD7400588DB5 /* ChangePasswordViewController.m in Sources */,
 				3C2C274726355996009460F5 /* CommonEditorCellTextView.m in Sources */,

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


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

@@ -30,8 +30,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4833"
-            endingLineNumber = "4833"
+            startingLineNumber = "4834"
+            endingLineNumber = "4834"
             landmarkName = "-tableView:willSelectRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -46,8 +46,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5205"
-            endingLineNumber = "5205"
+            startingLineNumber = "5206"
+            endingLineNumber = "5206"
             landmarkName = "-MPValueChanged:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -62,8 +62,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5204"
-            endingLineNumber = "5204"
+            startingLineNumber = "5205"
+            endingLineNumber = "5205"
             landmarkName = "-MPValueChanged:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -78,8 +78,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4860"
-            endingLineNumber = "4860"
+            startingLineNumber = "4861"
+            endingLineNumber = "4861"
             landmarkName = "-tableView:willSelectRowAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -110,8 +110,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5288"
-            endingLineNumber = "5288"
+            startingLineNumber = "5289"
+            endingLineNumber = "5289"
             landmarkName = "-DateTimeValueChanged:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -126,8 +126,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5318"
-            endingLineNumber = "5318"
+            startingLineNumber = "5319"
+            endingLineNumber = "5319"
             landmarkName = "-DateTimeValueChanged:indexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -382,8 +382,8 @@
             filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6175"
-            endingLineNumber = "6175"
+            startingLineNumber = "6176"
+            endingLineNumber = "6176"
             landmarkName = "-sync_loadCadidate:"
             landmarkType = "7">
          </BreakpointContent>
@@ -648,7 +648,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "46B085DC-E727-42D9-81F0-7841927ECC9E"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/Detail/DetailPageViewController.m"
@@ -696,7 +696,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "6D757B44-3F19-4378-AE89-C106D78C0A9F"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/RASingleton.m"
@@ -708,5 +708,277 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E12F8974-4426-421B-A485-6407FB727D7F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "154"
+            endingLineNumber = "154"
+            landmarkName = "+GetCadedate:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9C5D4122-67CC-4E8E-957D-A0CFE2639D1A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/EnumSelectOnlineViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "614"
+            endingLineNumber = "614"
+            landmarkName = "-loadData:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ACE295F4-B776-43D7-879D-1BFF960F11CA"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "315"
+            endingLineNumber = "315"
+            landmarkName = "-checkActivation"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E7046618-F4D5-4B41-80F8-E6B05F919161"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/NetworkUtils.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "831"
+            endingLineNumber = "831"
+            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F10B2966-A04B-48CB-B601-43AE32762809"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1790"
+            endingLineNumber = "1790"
+            landmarkName = "-translate_json:changed:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7D89B2E5-64EE-4DF7-BFFC-1E8CF3796750"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "237"
+            endingLineNumber = "237"
+            landmarkName = "+prepare_additional_params:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1E2F57A2-CD74-4DA3-8CB2-8668F4DC0C01"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "415"
+            endingLineNumber = "415"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "1E2F57A2-CD74-4DA3-8CB2-8668F4DC0C01 - 340d2b195e96f6b4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__41-[CommonEditorViewController viewDidLoad]_block_invoke"
+                  moduleName = "RA TradeFiling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/common/customUI/commoneditor/CommonEditorViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "415"
+                  endingLineNumber = "415"
+                  offsetFromSymbolStart = "19">
+               </Location>
+               <Location
+                  uuid = "1E2F57A2-CD74-4DA3-8CB2-8668F4DC0C01 - f6b71248aa76f262"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__41-[CommonEditorViewController viewDidLoad]_block_invoke_2"
+                  moduleName = "RA TradeFiling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/common/customUI/commoneditor/CommonEditorViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "416"
+                  endingLineNumber = "416"
+                  offsetFromSymbolStart = "47">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "818CFB4B-4DB7-46CA-8E3E-6B8A0747F20A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Detail/DetailTabBarController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "191"
+            endingLineNumber = "191"
+            landmarkName = "-editDetail:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4DF0A2AD-D868-45A4-87D4-D5C8EA4E7B72"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "334"
+            endingLineNumber = "334"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "99055D44-76BC-4295-8D13-9F571C529A5D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/NetworkUtils.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "583"
+            endingLineNumber = "583"
+            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "784175A4-EF0F-46B4-967A-CAE3809105E6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "7043"
+            endingLineNumber = "7043"
+            landmarkName = "-handle_editor_cell_select:IndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "99FA4D33-7037-4F64-85EF-4A4BAC1DE35C"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/NetworkUtils.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "840"
+            endingLineNumber = "840"
+            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F338980C-1778-47A1-8D7A-72BB94B73FEC"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "450"
+            endingLineNumber = "450"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E1EDC6B4-18BA-4BC2-955C-81288EDE1164"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1396"
+            endingLineNumber = "1396"
+            landmarkName = "-refresh:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6EE4B8D8-0E0C-4920-9756-F82520091D95"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/NetworkUtils.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "846"
+            endingLineNumber = "846"
+            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 3 - 0
RA TradeFiling/RA TradeFiling/FAKE_DATA/edit_isf.json

@@ -161,6 +161,9 @@
           "value_id": 11
         }
       },
+      "params":{
+          "name":"abc"
+      },
       "required": "true",
       "single_select": "true",
       "aname": "Test Online Enum"

+ 48 - 157
RA TradeFiling/RA TradeFiling/FAKE_DATA/edit_party.json

@@ -1,167 +1,58 @@
 {
-  "result": 2,
-  "section_count": 3,
-  "title": "DEMO ORDER DETAIL",
-  "section_0": {
-    "count": 8,
-    "title": "GENERAL INFORMATION",
-    "item_0": {
-      "control": "edit",
-      "value": "DNCYQDFDAL214088",
-      "name": "bol",
-      "aname": "Bill Of Lading",
-      "required": "true"
-    },
-    "item_1": {
-      "control": "enum",
-      "name": "bolcode",
-      "cadedate": {
-        "count": 2,
-        "val_1": {
-          "check": 0,
-          "value": "House Bill of Lading",
-          "value_id": 10
+    "section_0": {
+        "title": "CONTAINER INFORMATION",
+        "count": 7,
+        "item_0": {
+            "control": "edit",
+            "aname": "Addres11s 1",
+            "name": "companyname",
+            "value": "EMMY''S ARTISAN BAKERY",
+            "required": "false"
         },
-        "val_0": {
-          "check": 1,
-          "value": "Ocean Bill of Lading",
-          "value_id": 11
-        }
-      },
-      "required": "true",
-      "single_select": "true",
-      "aname": "BOL Code"
-    },
-    "item_2": {
-      "refresh": 1,
-      "control": "enum",
-      "name": "isf_type",
-      "cadedate": {
-        "count": 2,
-        "val_1": {
-          "check": 0,
-          "value": "5+2",
-          "value_id": 10
+        "item_1": {
+            "control": "edit",
+            "aname": "Addres1s 1",
+            "name": "address_11",
+            "value": "",
+            "required": "false"
         },
-        "val_0": {
-          "check": 1,
-          "value": "10+2",
-          "value_id": 11
-        }
-      },
-      "required": "true",
-      "single_select": "true",
-      "aname": "ISF Type"
-    },
-    "item_3": {
-      "control": "switch",
-      "name": "use_bond",
-      "value": "true",
-      "aname": "Use ISF Bond"
-    },
-    "item_4": {
-      "control": "enum",
-      "name": "action",
-      "cadedate": {
-        "count": 2,
-        "val_1": {
-          "check": 0,
-          "value": "Replace",
-          "value_id": 12
+        "item_2": {
+            "control": "edit",
+            "aname": "Address 1",
+            "name": "address_1",
+            "value": "",
+            "required": "false"
         },
-        "val_0": {
-          "check": 1,
-          "value": "Add",
-          "value_id": 11
-        }
-      },
-      "required": "true",
-      "single_select": "true",
-      "aname": "Action"
-    },
-    "item_5": {
-      "control": "edit",
-      "value": "23-235341400",
-      "name": "isfbondholder",
-      "aname": "ISF-BondHolder",
-      "required": "true"
-    },
-    "item_6": {
-      "control": "enum",
-      "name": "action",
-      "cadedate": {
-        "count": 4,
-        "val_0": {
-          "check": 1,
-          "value": "CT-Complete Transaction",
-          "value_id": 11
+        "item_3": {
+            "control": "edit",
+            "aname": "Address 2",
+            "name": "address_2",
+            "value": "",
+            "required": "false"
         },
-        "val_1": {
-          "check": 0,
-          "value": "FR-Flexible Range",
-          "value_id": 12
+        "item_4": {
+            "control": "edit",
+            "aname": "City",
+            "name": "city",
+            "value": "",
+            "required": "false"
         },
-        "val_2": {
-          "check": 0,
-          "value": "FT-Flexible Timing",
-          "value_id": 13
+        "item_5": {
+            "control": "edit",
+            "aname": "Zip",
+            "name": "zipcode",
+            "value": "",
+            "required": "false"
         },
-        "val_3": {
-          "check": 0,
-          "value": "FX-Flexible Range and Flexible Timing",
-          "value_id": 14
+        "item_6": {
+            "control": "edit",
+            "aname": "Country_Code",
+            "name": "country",
+            "value": "",
+            "required": "false"
         }
-      },
-      "required": "true",
-      "single_select": "true",
-      "aname": "Action Type Code"
-    },
-    "item_7": {
-      "value": "04/09/2017",
-      "type": "date",
-      "control": "datepicker",
-      "aname": "ETA",
-      "name": "eta"
-    }
-  },
-  "section_1": {
-    "title": "Parties Details",
-    "count": 2,
-    "item_0": {
-      "value": "CONTINENTAL MATERIALS INC.",
-      "control": "editor",
-      "aname": "SAME AS BY CONMAT00010001",
-      "name": "party_0",
-      "params": {
-        "action": "edit",
-        "sub_type": "party",
-        "id": "123456"
-      }
     },
-    "item_1": {
-      "control": "multi_action",
-      "count": 1,
-      "item_0": {
-        "name": "new",
-        "value": "12345678",
-        "refresh": 1,
-        "aname": "ADD"
-      },
-      "aname": "ADD PARTY"
-    }
-  },
-  "section_2": {
-    "title": " Addtional Reference",
-    "count": 1,
-    "item_0": {
-      "control": "edit",
-      "value": "",
-      "name": "cr",
-      "aname": "CR",
-      "required": "false"
-    }
-  },
-  "up_params": {
-    "count": 0
-  }
+    "result": 2,
+    "section_count": 1,
+    "title": "CONTAINER INFORMATION"
 }

+ 1 - 1
RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -300,7 +300,7 @@
     self.label_cache.layer.masksToBounds = YES;
     
     
-    [self checkActivation];
+//    [self checkActivation];
     [self checkPermission];
     [self clearNavigationbar];
     [self configureNavigationBar];

+ 1 - 1
RA TradeFiling/RA TradeFiling/TFEditor/TFEditorViewController.m

@@ -38,7 +38,7 @@
         vc.request_url=URL_EDIT;
         
         
-        vc.params = [item_json valueForKey:@"params"];
+        vc.params = [[item_json valueForKey:@"params"] mutableCopy];
 //        vc.params[@"action"] = @"edit";
 //        vc.params[@"sub_type"] = self.function_name;
         //                NSString *path = [[NSBundle mainBundle] pathForResource:@"search_ui.json" ofType:nil];

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

@@ -12,7 +12,7 @@
 #define JSON_TIMEOUT 60
 //#define fake_data false
 #ifdef DEBUG
-//    #define test_server
+    #define test_server
     #define fake_data false
 #else
     #define fake_data false
@@ -45,8 +45,8 @@
 #define URL_UPLOAD_IMG          @""
 #define URL_SAVE_EDITOR         BASE_URL@""
 
-#define URL_EDIT                BASE_URL@""
-#define URL_CADEDATE       BASE_URL@""
+#define URL_EDIT                BASE_URL@"/editorMobile.php"
+#define URL_CADEDATE            BASE_URL@"/resultMobile.php"
 
 //#define URL_SAVE_PANEL       BASE_URL@"/main_new_29.php"
 

+ 17 - 2
common/NetworkUtils.m

@@ -830,20 +830,35 @@ repeat:
                             NSString *str = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
                             DebugLog(@"request_interface result:%@", str);
                             NSMutableDictionary* dict =[[RAConvertor data2dict:responseData] mutableCopy];
+                            
+
                             if([dict[@"result"] intValue]==RESULT_USERAUTH_ERROR)
                             {
                                 dict[@"err_msg"]=@"Authorization failed.";
                             }
-                            
+                            // 兼容不同后台的错误消息反馈
                             if([dict[@"result"] intValue]!=RESULT_TRUE&&dict[@"msg"]!=nil && dict[@"err_msg"]==nil)
                             {
+                            
                                 dict[@"err_msg"]=dict[@"msg"];
                             }
+                            
+                            if([dict[@"result"] intValue]!=RESULT_TRUE&&dict[@"message"]!=nil && dict[@"err_msg"]==nil)
+                            {
+                                dict[@"err_msg"]=dict[@"message"];
+                            }
+                            
+                            
 //                            if([dict[@"result"] intValue]==RESULT_ERROR)
 //                            {
 ////                                RESULT_ERROR
 //                            }
-
+                            if(dict==nil)
+                            {
+                                dict= [NSMutableDictionary new];
+                                dict[@"result"]=@9;
+                                dict[@"err_msg"]=@"Sorry, can not access server, please contact support.";
+                            }
                             dispatch_async(dispatch_get_main_queue(), ^{
                                 if(result)
                                     return result(dict);