Procházet zdrojové kódy

The selected items of common editor enumeration type are not ticked -- common editor 枚举类型已选中的项没有打勾
(resolve: #14572)

Ray Zhang před 4 roky
rodič
revize
2939c8dcba

binární
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 224 - 0
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -36,5 +36,229 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8CA0655F-1BDD-4C1E-9CD7-9D7F3591E3F6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1034"
+            endingLineNumber = "1034"
+            landmarkName = "-showMoreOrderForSection:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BD1D2AEE-31ED-47F1-B7A6-39E569BDB81B"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1374"
+            endingLineNumber = "1374"
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "358AAAFD-FB46-48B3-81C3-A7D751816C35"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1393"
+            endingLineNumber = "1393"
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "358AAAFD-FB46-48B3-81C3-A7D751816C35 - adbdc81f1281180e"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__51-[CommonEditorViewController refresh:discardDirty:]_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 = "1393"
+                  endingLineNumber = "1393"
+                  offsetFromSymbolStart = "19">
+               </Location>
+               <Location
+                  uuid = "358AAAFD-FB46-48B3-81C3-A7D751816C35 - 1b447630f16fd938"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__51-[CommonEditorViewController refresh:discardDirty:]_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 = "1394"
+                  endingLineNumber = "1394"
+                  offsetFromSymbolStart = "47">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4EA2D464-9E48-4A3D-A63D-AEE58EF06681"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1400"
+            endingLineNumber = "1400"
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FC22237E-D2AA-48F8-B2D8-AE9C29E58F61"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1405"
+            endingLineNumber = "1405"
+            landmarkName = "-refresh:discardDirty:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "571B86C3-E815-40D7-AE94-14824728C492"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1332"
+            endingLineNumber = "1332"
+            landmarkName = "-CopyDirty:to:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DE55F235-350B-4128-A5D5-C802E1BBA44E"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/EnumSelectOnlineViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "649"
+            endingLineNumber = "649"
+            landmarkName = "-loadData:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "65C7D7FB-2640-4CF1-8E59-DA7907268D1A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "4760"
+            endingLineNumber = "4760"
+            landmarkName = "-tableView:willSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0754DDA0-95EB-4C0F-99BF-D8361A678119"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/EnumSelectViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "572"
+            endingLineNumber = "572"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "72C4EA86-7BC0-4EEC-9D83-5DA6E47D5D11"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "4759"
+            endingLineNumber = "4759"
+            landmarkName = "-tableView:willSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C1CA9B1B-AE1F-43E0-8923-9A7292FEB7EB"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/EnumSelectViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "427"
+            endingLineNumber = "427"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F1696174-03C8-4749-A75F-E747AD3C57DB"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "128"
+            endingLineNumber = "128"
+            landmarkName = "+LoadHome:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 55 - 1
RA TradeFiling/RA TradeFiling/FAKE_DATA/enum_cadedate.json

@@ -1,7 +1,7 @@
 {
     "title":"test online enum title",
     "result":2,
-  "count": 2,
+  "count": 4,
   "val_1": {
     "check": 0,
     "value": "House Bill of Lading",
@@ -28,6 +28,60 @@
     "customer_contact": " ",
     "customer_fax": ""
     
+  },
+  "val_3": {
+    "check": 0,
+    "value": "3",
+    "value_id": 10,
+    "business_card_2": "",
+    "business_card_0": "",
+    "customer_country": "US",
+    "customer_phone": "1234567890",
+    "business_card_1": "",
+    "customer_email": "po@test.com",
+    "customer_name": "Fake Order For Testing",
+    "customer_address3": "",
+    "customer_first_name": "",
+    "customer_address2": "Dock Doors 3-15",
+    "customer_contact_type": "CUSTOMER;",
+    "customer_contact_ext": "1405 Worldwide Blvd\r\nDock Doors 3-15\r\nHebron,KY 41048 US",
+    "customer_zipcode": "41048",
+    "customer_address1": "1405 Worldwide Blvd",
+    "customer_last_name": "",
+    "customer_city": "Hebron",
+    "customer_state": "KY",
+    "customer_sales_rep": "NPD-HOUSE ACCOUNT ",
+    "customer_cid": "FAKORD0001",
+    "customer_contact": " ",
+    "customer_fax": ""
+    
+  },
+  "val_2": {
+    "check": 0,
+    "value": "2",
+    "value_id": 10,
+    "business_card_2": "",
+    "business_card_0": "",
+    "customer_country": "US",
+    "customer_phone": "1234567890",
+    "business_card_1": "",
+    "customer_email": "po@test.com",
+    "customer_name": "Fake Order For Testing",
+    "customer_address3": "",
+    "customer_first_name": "",
+    "customer_address2": "Dock Doors 3-15",
+    "customer_contact_type": "CUSTOMER;",
+    "customer_contact_ext": "1405 Worldwide Blvd\r\nDock Doors 3-15\r\nHebron,KY 41048 US",
+    "customer_zipcode": "41048",
+    "customer_address1": "1405 Worldwide Blvd",
+    "customer_last_name": "",
+    "customer_city": "Hebron",
+    "customer_state": "KY",
+    "customer_sales_rep": "NPD-HOUSE ACCOUNT ",
+    "customer_cid": "FAKORD0001",
+    "customer_contact": " ",
+    "customer_fax": ""
+    
   },
   "val_0": {
     "check": 1,

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

@@ -19,7 +19,7 @@
 # endif
 
 #ifdef test_server
-    #define BASE_URL @"http://192.168.0.149/ACE_ISF_NEW"
+    #define BASE_URL @"http://192.168.0.161/ACE_ISF_NEW"
 #else
     #define BASE_URL @"https://ra.united-us.net/doc/bk"
 #endif

+ 1 - 1
common/customUI/commoneditor/EnumSelectOnlineViewController.h

@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark 在线cadedate
 @property bool online_enum ;
 @property (strong,nonatomic) NSString* online_keywords;
-@property (strong,nonatomic) NSString* online_url;
+//@property (strong,nonatomic) NSString* online_url;
 @property (strong,nonatomic) NSMutableDictionary* online_params;
 @end
 

+ 8 - 3
common/customUI/commoneditor/EnumSelectOnlineViewController.m

@@ -383,10 +383,15 @@
 //    cell.labelValue.text = value;
     int check = [[val_json valueForKey:@"check" ] intValue];
     if(check==1)
-    cell.img_checkmark.hidden=false;
+    {
+//    cell.img_checkmark.hidden=false;
+        cell.accessoryType = UITableViewCellAccessoryCheckmark;
+    }
     else
-    cell.img_checkmark.hidden=true;
-    
+    {
+        cell.accessoryType = UITableViewCellAccessoryNone;
+//    cell.img_checkmark.hidden=true;
+    }
     return cell;
     
 }

+ 8 - 2
common/customUI/commoneditor/EnumSelectViewController.m

@@ -426,9 +426,15 @@
 //    cell.labelValue.text = value;
     int check = [[val_json valueForKey:@"check" ] intValue];
     if(check==1)
-    cell.img_checkmark.hidden=false;
+    {
+//    cell.img_checkmark.hidden=false;
+        cell.accessoryType = UITableViewCellAccessoryCheckmark;
+    }
     else
-    cell.img_checkmark.hidden=true;
+    {
+        cell.accessoryType = UITableViewCellAccessoryNone;
+//    cell.img_checkmark.hidden=true;
+    }
     
     return cell;
     

+ 1 - 1
common/customUI/commoneditor/EnumSelectorCell.h

@@ -10,7 +10,7 @@
 #import "RTLabel.h"
 @interface EnumSelectorCell : UITableViewCell
 //@property (strong, nonatomic) IBOutlet UILabel *labelValue;
-@property (strong, nonatomic) IBOutlet UIImageView *img_checkmark;
+//@property (strong, nonatomic) IBOutlet UIImageView *img_checkmark;
 
 @property (strong, nonatomic) IBOutlet RTLabel *rtLabel;
 @end