Common

部分转换函数移动到RACConvertor里

RedAnt ERP Mobile/common/CommonEditor/CommonEditorCellImg.m

@@ -9,7 +9,7 @@
 #import "CommonEditorCellImg.h"
 
 #import "RAUtils.h"
-
+#import "RAConvertor.h"
 #import "ImageUploadViewController.h"
 #import "ImageViewController.h"
 
@@ -51,7 +51,7 @@
             
             self.imgs[tag] = url_up;
             
-            NSString* newurl=[RAUtils arr2string:self.imgs separator:@"," trim:false];
+            NSString* newurl=[RAConvertor arr2string:self.imgs separator:@"," trim:false];
             
             touchImageView.image=img;
             

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -26,6 +26,7 @@
 #import "CommonEditorCellTextView.h"
 #import "RAUtils.h"
 #import "CommonEditorCellImg.h"
+#import "RAConvertor.h"
 
 //#import "AFHTTPSessionManager.h"
 //#import "NetworkUtils.h"
@@ -314,7 +315,7 @@
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             
             NSDictionary* editor_json = [weakself request_Editor:weakself.request_url params:weakself.params];
-            DebugLog(@"data string: %@",[RAUtils dict2string:editor_json] );
+            DebugLog(@"data string: %@",[RAConvertor dict2string:editor_json] );
             dispatch_async(dispatch_get_main_queue(), ^{
                 
                 [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -1121,7 +1122,7 @@
             }
             
             NSDictionary* editor_json = [weakself request_Editor:weakself.request_url params:weakself.params];
-            DebugLog(@"data string: %@",[RAUtils dict2string:editor_json] );
+            DebugLog(@"data string: %@",[RAConvertor dict2string:editor_json] );
 
             dispatch_async(dispatch_get_main_queue(), ^{
                 [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -1526,6 +1527,7 @@
             for(int j=0;j<item_count;j++)
             {
                 NSMutableDictionary * itemjson=[[sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
+                NSAssert(itemjson!=nil, @"Backend error, item is null section:%d item %d",i,item_count);
                 [sectionarr addObject:itemjson];
                 [self add_subitem:itemjson addto:sectionarr parent:[NSString stringWithFormat:@"%d_%d",i,j ]];
                 //                [itemjson setObject:cadedatejson forKey:@"cadedate"];

RedAnt ERP Mobile/common/CommonEditor/EnumSelectAndSort/EnumModel.h

@@ -11,7 +11,7 @@
 @interface EnumModel : NSObject
 
 @property (nonatomic,assign) BOOL check;
-@property (nonatomic,assign) NSInteger value_id;
+@property (nonatomic,assign) NSString* value_id;
 @property (nonatomic,copy) NSString *value;
 @property (nonatomic,assign) NSInteger sort_id;
 

RedAnt ERP Mobile/common/CommonEditor/EnumSelectAndSort/EnumSelectAndSortViewController.m

@@ -122,7 +122,7 @@
         NSDictionary *val_json = @{
                                    @"check": @(model.check),
                                    @"value": model.value,
-                                   @"value_id": @(model.value_id)
+                                   @"value_id": model.value_id
                                    };
         NSString *key = [NSString stringWithFormat:@"val_%d",i];
         [dic setObject:val_json forKey:key];

RedAnt ERP Mobile/common/RAUtils.h

@@ -33,10 +33,7 @@
 +(UIColor*) strColor:(NSString*) color;
 
 +(NSString*) get_config_path;
-+(NSDictionary*) string2dict:(NSString*) str;
-+(NSString*) dict2string:(NSDictionary*) dict;
-+(NSString*) arr2string:(NSArray *) arr separator:(NSString*)separator trim:(bool) btrim;
-+(NSString*) arr2string:(NSArray *) arr separator:(NSString*)separator trim:(bool) btrim brackets:(NSString*)brackets;
+
 +(NSString*) base64en:(NSString*) string;
 +(NSString*) base64de:(NSString*) string;
 +(NSDictionary*) device_info;

RedAnt ERP Mobile/common/RAUtils.m

@@ -607,51 +607,7 @@
     
     return stringArray;
 }
-+(NSString*) arr2string:(NSArray *) arr separator:(NSString*)separator trim:(bool) btrim
-{
-    if(arr.count==0)
-        return nil;
-    NSMutableArray * marr = [arr mutableCopy];
-    
-begin:
-    for (NSString* item in marr) {
-        if(item.length==0 )
-            if( btrim)
-            {
-                
-                [marr removeObject:item];
-                goto begin;
-            }
-        
-    }
-    NSString * ret = [marr componentsJoinedByString:separator];
-    return ret;
-}
-+(NSString*) arr2string:(NSArray *) arr separator:(NSString*)separator trim:(bool) btrim brackets:(NSString*)brackets
-{
-    if(brackets!=nil)
-        separator = [NSString stringWithFormat:@"%@%@%@",brackets,separator,brackets];
-    NSMutableArray * marr = [arr mutableCopy];
-begin:
-    for (NSString* item in marr) {
-        if(item.length==0 )
-            if( btrim)
-            {
-                
-                [marr removeObject:item];
-                goto begin;
-            }
-        
-        
-        
-    }
-    NSString * ret = [marr componentsJoinedByString:separator];
-    
-    if(brackets!=nil)
-        ret = [NSString stringWithFormat:@"%@%@%@",brackets,ret,brackets];
-    
-    return ret;
-}
+
 +(NSDictionary*) string2dict:(NSString*) str
 {
     
@@ -671,28 +627,7 @@ begin:
     
     return [UIColor blackColor];
 }
-+(NSData*) dict2data:(NSDictionary*) dict
-{
-    if(dict==nil)
-        return nil;
-    // 将NSDictionary转化为NSData
-    NSData *data = [NSJSONSerialization dataWithJSONObject:dict options:kNilOptions error:nil];
-    return data;
-}
-+(NSString*) dict2string:(NSDictionary*) dict
-{
-    
-    if(dict==nil)
-        return nil;
-    
-    // 将NSDictionary转化为NSData
-    NSData *data = [NSJSONSerialization dataWithJSONObject:dict options:kNilOptions error:nil];
-    
-    // 再将NSData转为字符串
-    NSString *jsonStr = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-    
-    return jsonStr;
-}
+
 +(NSString*) base64en:(NSString*) string
 {