1.11

RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -262,6 +262,8 @@
 		3C833CB825C94289006F9BEF /* detail_emanifest.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C833CB725C94289006F9BEF /* detail_emanifest.json */; };
 		3C833CBE25C944FE006F9BEF /* DetailCellContainerCA.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C833CBD25C944FE006F9BEF /* DetailCellContainerCA.m */; };
 		3C833CD225CBF10B006F9BEF /* fake_export.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C833CD125CBF10A006F9BEF /* fake_export.pdf */; };
+		3C97FE67270058E4005DB50C /* my_d.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C97FE66270058E4005DB50C /* my_d.json */; };
+		3C97FE6B2701C0B6005DB50C /* edit_notification_setting.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C97FE6A2701C0B6005DB50C /* edit_notification_setting.json */; };
 		3CAB3FDB2564F27D00CB554D /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CAB3FDA2564F27D00CB554D /* RAUtils.m */; };
 /* End PBXBuildFile section */
 
@@ -710,6 +712,8 @@
 		3C833CBD25C944FE006F9BEF /* DetailCellContainerCA.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DetailCellContainerCA.m; sourceTree = "<group>"; };
 		3C833CD125CBF10A006F9BEF /* fake_export.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = fake_export.pdf; sourceTree = "<group>"; };
 		3C92A176264677A700344B9B /* common_const.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = common_const.h; path = ../../common/common_const.h; sourceTree = "<group>"; };
+		3C97FE66270058E4005DB50C /* my_d.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = my_d.json; sourceTree = "<group>"; };
+		3C97FE6A2701C0B6005DB50C /* edit_notification_setting.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = edit_notification_setting.json; sourceTree = "<group>"; };
 		3CAB3FD92564F27D00CB554D /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = ../../common/RAUtils.h; sourceTree = "<group>"; };
 		3CAB3FDA2564F27D00CB554D /* RAUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAUtils.m; path = ../../common/RAUtils.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -860,6 +864,7 @@
 				3C0CB38D255E618800718A03 /* MylistViewController.m */,
 				3C0CB3AE255E821500718A03 /* My.storyboard */,
 				3C5F8C86256B935E00CFD26A /* my.json */,
+				3C97FE66270058E4005DB50C /* my_d.json */,
 			);
 			path = My;
 			sourceTree = "<group>";
@@ -1360,6 +1365,7 @@
 				3C833CB225C941AB006F9BEF /* detail_aci.json */,
 				3C833CB725C94289006F9BEF /* detail_emanifest.json */,
 				3C5FBF3A2637E83300130F65 /* edit_isf.json */,
+				3C97FE6A2701C0B6005DB50C /* edit_notification_setting.json */,
 				3C5FBF62263BAD3A00130F65 /* edit_party.json */,
 				3C02E835264E610E008DA531 /* enum_cadedate.json */,
 			);
@@ -1690,6 +1696,7 @@
 				3C5F8D14257A265600CFD26A /* result_emanifest.json in Resources */,
 				3C5F8CE52578807100CFD26A /* search_isf.json in Resources */,
 				3C2C2752263559C1009460F5 /* Phone_Range_Cell.xib in Resources */,
+				3C97FE6B2701C0B6005DB50C /* edit_notification_setting.json in Resources */,
 				3C243186258B019B00555555 /* result_customer.json in Resources */,
 				3C2C26E62635577F009460F5 /* Phone_Action_Cell.xib in Resources */,
 				3C5F8CD725777E7300CFD26A /* Fields.storyboard in Resources */,
@@ -1721,6 +1728,7 @@
 				3C7670562599B2C700588DB5 /* ResulteManifestCell.xib in Resources */,
 				3C2431522589EF7400555555 /* searchresult_isf.json in Resources */,
 				3C2C26D626355728009460F5 /* Phone_Banner_Cell.xib in Resources */,
+				3C97FE67270058E4005DB50C /* my_d.json in Resources */,
 				3C2C27DE263666E8009460F5 /* PhotoList.storyboard in Resources */,
 				3C2C279026366294009460F5 /* Signature.xcassets in Resources */,
 				3C2C272E263558FA009460F5 /* Phone_Signature_Cell.xib in Resources */,
@@ -2121,7 +2129,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.10;
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -2142,7 +2150,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.10;
+				MARKETING_VERSION = 1.11;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

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

@@ -100,5 +100,101 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "91012BD5-E766-4806-9C41-1B6B1B5722BE"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "199"
+            endingLineNumber = "199"
+            landmarkName = "+request_detail:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "58E392F4-40B6-47C9-A590-7F29B016AE53"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/My/MylistViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "96"
+            endingLineNumber = "96"
+            landmarkName = "-PerformAction:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ED680E16-4C2C-4983-B50E-0D42E56C888D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OfflineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "167"
+            endingLineNumber = "167"
+            landmarkName = "+request_editor:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2F4DAF42-8FEE-451D-BFE4-4628AF3269A5"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/My/MylistViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "112"
+            endingLineNumber = "112"
+            landmarkName = "-PerformAction:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BC4543A2-4ECE-48BE-9875-1BF8FF666459"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OfflineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "168"
+            endingLineNumber = "168"
+            landmarkName = "+request_editor:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "40845717-8F9B-4E9D-A0AF-7DC693921052"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../common/customUI/commoneditor/CommonEditorViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3991"
+            endingLineNumber = "3991"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.h

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)request_fastdownload:(NSMutableDictionary *)params url:(NSString *)url completionHandler:(resultHandler)result;
 +(void)request_save_editor:(NSMutableDictionary*)params completionHandler:(resultHandler)result;
 +(void)request_commoneditor_partialrefresh: (NSMutableDictionary*)params url:(NSString*)url completionHandler:(resultHandler)result;
-
++(void) request_editor: (NSMutableDictionary *) params completionHandler:(resultHandler)result;
 
 + (void)request_cadedate:(NSMutableDictionary *)params completionHandler:(resultHandler)result;
 //+ (void)request_savepanel: (NSString*)panel_setting completionHandler:(resultHandler)result;

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.m

@@ -181,7 +181,19 @@
 //    } retry:0];
 //
 }
++(void) request_editor: (NSMutableDictionary *) params completionHandler:(resultHandler)result
+{
+    [self request_interface:URL_REQUEST_DETAIL parameters:params err_record_url:nil completionHandler:result retry:0];
 
+//    AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+//        [params setValue:@"handset_search" forKey:@"action"];
+////    [params setValue:appDelegate.sessionid forKey:@"sessionid"];
+//
+//
+//    [self request_interface:URL_REQUEST_RECORDS parameters:params err_record_url:nil completionHandler:result retry:0];
+//    return;
+ 
+}
 +(void) request_detail: (NSMutableDictionary *) params completionHandler:(resultHandler)result
 {
     [self request_interface:URL_REQUEST_DETAIL parameters:params err_record_url:nil completionHandler:result retry:0];

RA TradeFiling/RA TradeFiling/DataProvider/RADataProvider.m

@@ -184,7 +184,7 @@
     }
     else
     {
-        [OnlineDataProvider request_detail:params completionHandler:result];
+        [OnlineDataProvider request_editor:params completionHandler:result];
         
     }
 }

RA TradeFiling/RA TradeFiling/FAKE_DATA/edit_notification_setting.json

@@ -0,0 +1,57 @@
+{
+  "menu": [
+    {
+      "name": "save",
+      "title": "SAVE",
+      "url": "",
+      "params": {
+        "action": "123"
+      }
+    }
+  ],
+  "result": 2,
+  "section_count": 3,
+  "title": "DEMO NOTIFICATION SETTING",
+  "section_0": {
+    "count": 1,
+    "title": "GENERAL SETTING",
+    "item_0": {
+      "control": "switch",
+      "name": "endable_notification",
+      "value": "true",
+      "aname": "Enable Notification"
+    }
+  },
+  "section_1": {
+    "title": "ISF Notification",
+    "count": 2,
+    "item_0": {
+      "value": "true",
+      "control": "switch",
+      "aname": "HOLD",
+      "detail": "status 01,03,05",
+      "name": "isf_n_hold"
+    },
+    "item_1": {
+      "value": "true",
+      "control": "switch",
+      "detail": "status 02,04,06",
+      "aname": "FAIL",
+      "name": "isf_n_fail"
+    }
+  },
+  "section_2": {
+    "title": " ACI Notification",
+    "count": 1,
+    "item_0": {
+      "value": "true",
+      "control": "switch",
+      "detail": "status 011,031,051",
+      "aname": "HOLD",
+      "name": "isf_n_hold"
+    }
+  },
+  "up_params": {
+    "count": 0
+  }
+} 

RA TradeFiling/RA TradeFiling/My/MylistViewController.m

@@ -13,9 +13,11 @@
 //#import "MessageViewController.h"
 #import "ChangePasswordViewController.h"
 #import "JLCustomerNavigationAlertController.h"
+#import "TFEditorViewController.h"
 
 #import "RASingleton.h"
 #import "RADataProvider.h"
+#import "config.h"
 @interface MylistViewController ()
 
 @end
@@ -63,9 +65,14 @@
 }
 - (void)LoadModelist
 {
-    NSData* json =[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:@"my" ofType:@"json" ]];
     
     
+#ifdef DEBUG
+    NSData* json =[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:@"my_d" ofType:@"json" ]];
+#else
+    NSData* json =[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:@"my" ofType:@"json" ]];
+#endif
+    
     
     if(json==nil)
     {
@@ -98,6 +105,22 @@
         viewcontroller.title = @"Saved Search";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
+    else if([type isEqualToString:@"notification_setting"])
+    {
+        
+        NSMutableDictionary * params = [NSMutableDictionary new];
+        params[@"sub_type"]=type;
+        
+        TFEditorViewController *vc = [[UIStoryboard storyboardWithName:@"TFEditor" bundle:nil] instantiateViewControllerWithIdentifier:@"TFEditorViewController"];
+        
+        
+        vc.url_type = URL_REMOTE;
+        vc.request_url=URL_EDIT;
+        
+        
+        vc.params = params;
+        [self.navigationController pushViewController:vc animated:NO];
+    }
 //    else if([type isEqualToString:@"saved_document"])
 //    {
 //        LocalDocumentsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LocalDocumentsViewController"];

RA TradeFiling/RA TradeFiling/My/my_d.json

@@ -0,0 +1,53 @@
+{
+    "remark":"debug my菜单",
+    "modelist": [
+                 {
+                 "name": "Saved Log",
+                 "detail": "View saved detail information",
+                 "icon": "mode_detail",
+                 "type": "saved_detail"
+                 },
+                 {
+                 "name": "Saved Search",
+                 "detail": "View saved search criteria",
+                 "icon": "mode_search",
+                 "type": "saved_search"
+                 },
+                 {
+                 "name": "Notification Setting",
+                 "detail": "Setup notifaction",
+                 "icon": "mode_notification_setting",
+                 "type": "notification_setting"
+                 },
+                 {
+                 "name": "Change Password",
+                 "detail": "Update login password",
+                 "icon": "mode_change_password",
+                 "type": "change_password"
+                 },
+                 {
+                 "name": "Logout",
+                 "detail": "Sign out",
+                 "icon": "mode_logout",
+                 "type": "logout"
+                 }
+                 ],
+    "title": "My",
+    "icon":"tab_my",
+    "removed modelist":[
+        
+     {
+     "name": "Message",
+     "detail": "Notifacation message",
+     "icon": "mode_message",
+     "type": "message"
+     },
+     {
+     "name": "Saved Documents",
+     "detail": "Documents you have downloaded",
+     "icon": "mode_document",
+     "type": "saved_document"
+     }
+    ]
+}
+