0612

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -215,6 +215,9 @@
     NSMutableDictionary* upparams=[[NSMutableDictionary alloc] init];
     //  [upparams setValue:[self.params valueForKey:@"cart2Checkbox"] forKey:@"cart2Checkbox"];
     int section_count=self.content_data_control.count;//[[self.content_data_download valueForKey:@"section_count"] intValue];
+    
+    
+    NSString* aaa  = [RAUtils dict2string:self.content_data_control];
     for(int i=0;i<section_count;i++)
     {
         NSLog(@"debug...section:%d",i);
@@ -240,34 +243,7 @@
                         if([[valjson valueForKey:@"check"]intValue]==1)
                         {
                             [upparams setValue:[valjson valueForKey:@"value_id"] forKey:[itemjson valueForKey:@"name"]];
-                            //                            NSMutableDictionary* subjson=nil;
-                            //                            subjson=[[valjson objectForKey:@"sub_item"] mutableCopy];
-                            //                            if( subjson!=nil /*&& !active*/)
-                            //                            {
-                            //                                int sub_count = [[subjson valueForKey:@"count"] intValue];
-                            //                                for(int l=0;l<sub_count;l++)
-                            //                                {
-                            //                                    NSMutableDictionary * modify_item=[[subjson objectForKey:[NSString stringWithFormat:@"item_%d",l ]] mutableCopy];
-                            //                                    if([modify_item valueForKey:@"value"]!=nil && ![[modify_item valueForKey:@"value"]isEqualToString:@""])
-                            //                                        [upparams setValue:[modify_item valueForKey:@"value"] forKey:[modify_item valueForKey:@"name"]];
-                            //                                    else
-                            //                                    {
-                            //                                        if([[modify_item valueForKey:@"required"] isEqualToString: @"true"] )
-                            //                                        {
-                            //                                            self.cancommit = false;
-                            //                                            [fields addObject:itemjson[@"aname"]];
-                            //                                            NSIndexPath* indexpath =[self get_indexpath1:[modify_item valueForKey:@"name"]];
-                            //                                            [self unhide_section:indexpath.section];
-                            //                                            if(fields.count==1)
-                            //                                            {
-                            //                                                self.first_miss_pos =  indexpath;
-                            //
-                            //                                            }
-                            //                                        }
-                            //                                    }
-                            //                                }
-                            //                            }
-                            
+
                             
                             setvalue=true;
                             break;
@@ -469,9 +445,9 @@
                         }
                     }
                 }
-            subitem_data * data=[self subitem_param:itemjson addto:upparams alert:alert];
-            upparams= data.params;
-            fields=[[fields arrayByAddingObjectsFromArray:data.missingfields] mutableCopy];
+//            subitem_data * data=[self subitem_param:itemjson addto:upparams alert:alert];
+//            upparams= data.params;
+//            fields=[[fields arrayByAddingObjectsFromArray:data.missingfields] mutableCopy];
         }
     }
     if(self.cancommit==false && alert)

RedAnt ERP Mobile/common/Functions/DefaultImageButton.h

@@ -0,0 +1,13 @@
+//
+//  DefaultImageButton.h
+//  HMLG Mobile
+//
+//  Created by Ray on 5/30/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface DefaultImageButton : UIButton
+
+@end

RedAnt ERP Mobile/common/Functions/DefaultImageButton.m

@@ -0,0 +1,21 @@
+//
+//  DefaultImageButton.m
+//  HMLG Mobile
+//
+//  Created by Ray on 5/30/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#import "DefaultImageButton.h"
+
+@implementation DefaultImageButton
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

RedAnt ERP Mobile/common/customUI/ImageUploadViewController.m

@@ -107,7 +107,7 @@
     [super viewDidLoad];
     
     
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onBackClick:)];

RedAnt ERP Mobile/common/customUI/ImageViewController.m

@@ -16,13 +16,13 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onBackClick:)];
     
     
-    UIBarButtonItem *downloadButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"download"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *downloadButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"download"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onDownloadClick:)];