TradeFiling 增加编辑保存接口

修复注册界面窗口上移位置错误的bug

RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -2101,7 +2101,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48501;
+				CURRENT_PROJECT_VERSION = 48586;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
@@ -2122,7 +2122,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48501;
+				CURRENT_PROJECT_VERSION = 48586;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";

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

@@ -174,8 +174,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "68"
-            endingLineNumber = "68"
+            startingLineNumber = "69"
+            endingLineNumber = "69"
             landmarkName = "-touchesBegan:withEvent:"
             landmarkType = "7">
          </BreakpointContent>
@@ -190,8 +190,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "245"
-            endingLineNumber = "245"
+            startingLineNumber = "246"
+            endingLineNumber = "246"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
@@ -206,8 +206,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "263"
-            endingLineNumber = "263"
+            startingLineNumber = "265"
+            endingLineNumber = "265"
             landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
@@ -222,8 +222,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "237"
-            endingLineNumber = "237"
+            startingLineNumber = "238"
+            endingLineNumber = "238"
             landmarkName = "-textFieldShouldReturn:"
             landmarkType = "7">
          </BreakpointContent>
@@ -238,8 +238,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "233"
-            endingLineNumber = "233"
+            startingLineNumber = "234"
+            endingLineNumber = "234"
             landmarkName = "-textFieldShouldBeginEditing:"
             landmarkType = "7">
          </BreakpointContent>
@@ -254,8 +254,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
+            startingLineNumber = "258"
+            endingLineNumber = "258"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
@@ -270,8 +270,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "271"
-            endingLineNumber = "271"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>
@@ -286,8 +286,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "249"
-            endingLineNumber = "249"
+            startingLineNumber = "250"
+            endingLineNumber = "250"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
@@ -302,8 +302,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "243"
-            endingLineNumber = "243"
+            startingLineNumber = "244"
+            endingLineNumber = "244"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
@@ -318,8 +318,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "260"
-            endingLineNumber = "260"
+            startingLineNumber = "262"
+            endingLineNumber = "262"
             landmarkName = "-keyboardWillShow:"
             landmarkType = "7">
          </BreakpointContent>
@@ -334,8 +334,8 @@
             filePath = "RA TradeFiling/SignUp/SignupViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "275"
-            endingLineNumber = "275"
+            startingLineNumber = "277"
+            endingLineNumber = "277"
             landmarkName = "-keyboardWillHide:"
             landmarkType = "7">
          </BreakpointContent>

RA TradeFiling/RA TradeFiling/DataProvider/OfflineDataProvider.h

@@ -26,8 +26,8 @@ typedef void(^resultHandler)(NSMutableDictionary *result);
 + (void)request_fastdownload:(NSMutableDictionary *)params url:(NSString *)url completionHandler:(resultHandler)result;
 
 + (void)request_editor: (NSMutableDictionary *) params completionHandler:(resultHandler)result;
-
-
++(void)request_save_editor:(NSMutableDictionary*)params completionHandler:(resultHandler)result;
++(void)request_commoneditor_partialrefresh: (NSMutableDictionary*)params completionHandler:(resultHandler)result;
 @end
 
 NS_ASSUME_NONNULL_END

RA TradeFiling/RA TradeFiling/DataProvider/OfflineDataProvider.m

@@ -109,6 +109,21 @@
     
 
 }
++(void)request_save_editor:(NSMutableDictionary*)params completionHandler:(resultHandler)result
+{
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        sleep(0);
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            result( [@{@"result":@2} mutableCopy]);
+        });
+        
+
+        
+        
+    });
+}
+
 + (void)request_editor: (NSMutableDictionary *) params completionHandler:(resultHandler)result
 {
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
@@ -124,6 +139,38 @@
             
             
             
+            dispatch_async(dispatch_get_main_queue(), ^{
+                result( [@{@"result":@2} mutableCopy]);
+            });
+            
+        }
+        NSError *error=nil;
+        NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error] ;
+        
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            result( [dict mutableCopy]);
+        });
+        
+        
+    });
+}
+
++(void)request_commoneditor_partialrefresh: (NSMutableDictionary*)params completionHandler:(resultHandler)result
+{
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        sleep(0);
+        
+        NSString* file = [NSString stringWithFormat:@"edit_%@",params[@"sub_type"]];
+        NSData* json =[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:file ofType:@"json" ]];
+        
+        
+        if(json==nil)
+        {
+         
+            
+            
+            
             dispatch_async(dispatch_get_main_queue(), ^{
                 result( [@{@"result":@2} mutableCopy]);
             });

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.h

@@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (void) request_detail: (NSMutableDictionary *) params completionHandler:(resultHandler)result;
 + (void)request_retrievepassword: (NSString*)user  email:(NSString*)email completionHandler:(resultHandler)result;
 + (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_savepanel: (NSString*)panel_setting completionHandler:(resultHandler)result;
 @end
 

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.m

@@ -92,7 +92,49 @@
     params[@"action"]=@"dashboardMobile";
     [self request_interface:URL_HOME parameters:params err_record_url:nil completionHandler:result retry:0];
 }
++(void)request_commoneditor_partialrefresh: (NSMutableDictionary*)params url:(NSString*)url completionHandler:(resultHandler)result
+{
 
+    [self request_interface:url parameters:params err_record_url:nil completionHandler:result retry:0];
+    
+    
+    //
+    //    if(appDelegate.offline_mode)
+    //    {
+    //        params[@"offline_Command"]=url;
+    //        return [OLDataProvider offline_commoneditor_partialrefresh:params];
+    //    }
+    //
+    //    if(![self IsNetworkAvailable])
+    //        return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
+    //
+    //    NSData* json=[self get_json:url parameters:params];
+    //    if(json!=nil)
+    //    {
+    //        NSError *error=nil;
+    //        NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
+    //        if([[jsobj valueForKey:@"result"]intValue]==2)
+    //            [appDelegate SetSo:nil];
+    //
+    //
+    //        return jsobj;
+    //    }
+    //    else
+    //        return nil;
+}
+
+
++(void)request_save_editor:(NSMutableDictionary*)params completionHandler:(resultHandler)result
+{
+    //    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+  
+    
+    
+
+    [self request_interface:URL_SAVE_EDITOR parameters:params err_record_url:nil completionHandler:result retry:0];
+    
+    
+}
 + (void)request_result:(NSMutableDictionary *)params completionHandler:(resultHandler)result
 {
     

RA TradeFiling/RA TradeFiling/DataProvider/RADataProvider.m

@@ -97,7 +97,18 @@
         
     }
 }
-
++(void)SaveEditor:(NSMutableDictionary*)params completionHandler:(resultHandler)result
+{
+    if(fake_data)
+    {
+        [OfflineDataProvider request_save_editor:params completionHandler:result];
+    }
+    else
+    {
+        [OnlineDataProvider request_save_editor:params completionHandler:result];
+        
+    }
+}
 
 + (void)DownloadFile:(NSMutableDictionary *)params url:(NSString *)url completionHandler:(resultHandler)result;
 {
@@ -167,11 +178,11 @@
 {
     if(fake_data)
     {
-        result([OfflineDataProvider request_detail:params]);
+        [OfflineDataProvider request_commoneditor_partialrefresh:params completionHandler:result];
     }
     else
     {
-        [OnlineDataProvider request_detail:params completionHandler:result];
+        [OnlineDataProvider request_commoneditor_partialrefresh:params url:url completionHandler:result];
         
     }
 }

RA TradeFiling/RA TradeFiling/SignUp/SignupViewController.m

@@ -12,6 +12,7 @@
 @interface SignupViewController ()
 @property(nonatomic ,strong) UITextField * firstResponderTextF;//记录将要编辑的输入框
 @property (assign) int y;
+@property (assign) int offset;
 @end
 
 @implementation SignupViewController
@@ -30,7 +31,7 @@
     self.tf_email.delegate=self;
     self.tf_pass0.delegate=self;
     self.tf_pass1.delegate=self;
-    
+    _offset=0;
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
     [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
     // Do any additional setup after loading the view.
@@ -251,12 +252,13 @@
     NSTimeInterval animationDuration = [animationDurationValue doubleValue];
     if (keyboardTop < CGRectGetMaxY(rect)) {//如果键盘盖住了输入框
         CGFloat gap = keyboardTop - CGRectGetMaxY(rect) - 10;//计算需要网上移动的偏移量（输入框底部离键盘顶部为10的间距）
+        _offset = _offset+gap;
 //        __weak typeof(self)weakSelf = self;
 //        [UIView animateWithDuration:animationDuration animations:^{
 //
 //        }];
         
-        self.view.frame = CGRectMake(self.view.frame.origin.x, gap, self.view.frame.size.width, self.view.frame.size.height);
+        self.view.frame = CGRectMake(self.view.frame.origin.x, _offset, self.view.frame.size.width, self.view.frame.size.height);
     }
 }
 - (void)keyboardWillHide:(NSNotification *)notification{
@@ -264,7 +266,7 @@
     NSNumber * animationDurationValue = [userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey];//获取键盘隐藏动画时间值
     NSTimeInterval animationDuration = [animationDurationValue doubleValue];
     if (self.view.frame.origin.y < 0) {//如果有偏移，当影藏键盘的时候就复原
-        
+        _offset = 0;
         self.view.frame = CGRectMake(self.view.frame.origin.x, self.y, self.view.frame.size.width, self.view.frame.size.height);
 //        __weak typeof(self)weakSelf = self;
 //        [UIView animateWithDuration:animationDuration animations:^{

RA TradeFiling/RA TradeFiling/config.h

@@ -43,9 +43,9 @@
 
 // commoneditor 图片上传url
 #define URL_UPLOAD_IMG          @""
+#define URL_SAVE_EDITOR         BASE_URL@""
 
-
-#define URL_EDIT                @""
+#define URL_EDIT                BASE_URL@""
 
 //#define URL_SAVE_PANEL       BASE_URL@"/main_new_29.php"