ERP MOBILE.

修复签名模块诸多问题
增加消息发送和处理，还在完善中

Apex Mobile/Apex Mobile/Apex Mobile-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>180720</string>
+	<string>180723</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "538020091.9615721"
+            timestampString = "553678083.3471709"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
+            startingLineNumber = "102"
+            endingLineNumber = "102"
             landmarkName = "-reloadCart:immediately:"
             landmarkType = "7">
          </BreakpointContent>
@@ -202,7 +202,7 @@
                   moduleName = "UWAVER Mobile"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
-                  timestampString = "550140663.791118"
+                  timestampString = "554112755.412902"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1999"
@@ -217,7 +217,7 @@
                   moduleName = "UWAVER Mobile"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
-                  timestampString = "550140663.79418"
+                  timestampString = "554112755.415642"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1999"
@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/signature/SignatureView.m"
-            timestampString = "550140662.7656749"
+            timestampString = "554026961.421681"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1045"
-            endingLineNumber = "1045"
+            startingLineNumber = "1060"
+            endingLineNumber = "1060"
             landmarkName = "-setLineWidth:"
             landmarkType = "7">
          </BreakpointContent>
@@ -266,11 +266,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/signature/SignatureView.m"
-            timestampString = "550140662.766166"
+            timestampString = "554026961.422219"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1054"
-            endingLineNumber = "1054"
+            startingLineNumber = "1069"
+            endingLineNumber = "1069"
             landmarkName = "-touchesBegan:withEvent:"
             landmarkType = "7">
          </BreakpointContent>
@@ -282,11 +282,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/signature/SignatureView.m"
-            timestampString = "550140662.7664649"
+            timestampString = "554026961.422496"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1053"
-            endingLineNumber = "1053"
+            startingLineNumber = "1068"
+            endingLineNumber = "1068"
             landmarkName = "-touchesBegan:withEvent:"
             landmarkType = "7">
          </BreakpointContent>
@@ -298,14 +298,302 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/signature/SignatureView.m"
-            timestampString = "550140662.766734"
+            timestampString = "554026961.422742"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1052"
-            endingLineNumber = "1052"
+            startingLineNumber = "1067"
+            endingLineNumber = "1067"
             landmarkName = "-touchesBegan:withEvent:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/MainViewController.m"
+            timestampString = "553678083.347527"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "131"
+            endingLineNumber = "131"
+            landmarkName = "-reloadPortfolio:immediately:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "553678083.347576"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "168"
+            endingLineNumber = "168"
+            landmarkName = "-OnReloadData:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/ActiveViewController.m"
+            timestampString = "553678083.347625"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "147"
+            endingLineNumber = "147"
+            landmarkName = "-OnRefreshUI:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureViewController.m"
+            timestampString = "554112755.263914"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "192"
+            endingLineNumber = "192"
+            landmarkName = "-onDone:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.423076"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "686"
+            endingLineNumber = "686"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.423352"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "687"
+            endingLineNumber = "687"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.423622"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "694"
+            endingLineNumber = "694"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.423862"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "692"
+            endingLineNumber = "692"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.424113"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "709"
+            endingLineNumber = "709"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureViewController.m"
+            timestampString = "554112755.2659709"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "196"
+            endingLineNumber = "196"
+            landmarkName = "-onDone:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.424377"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "605"
+            endingLineNumber = "605"
+            landmarkName = "-initWithFrame:context:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.4246221"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "670"
+            endingLineNumber = "670"
+            landmarkName = "-updateRectWithPoint:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.424861"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "747"
+            endingLineNumber = "747"
+            landmarkName = "-tap:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.425101"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "669"
+            endingLineNumber = "669"
+            landmarkName = "-updateRectWithPoint:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.425359"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "712"
+            endingLineNumber = "712"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.425635"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "697"
+            endingLineNumber = "697"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554026961.425874"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "699"
+            endingLineNumber = "699"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/signature/SignatureView.m"
+            timestampString = "554027079.41415"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "703"
+            endingLineNumber = "703"
+            landmarkName = "-Signature2Image"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/ActiveViewController.h

@@ -8,6 +8,7 @@
 
 #import <UIKit/UIKit.h>
 //#import "TouchLabel.h"
+#import "NotificationNameCenter.h"
 @protocol ActiveViewController
 
 @required
@@ -35,4 +36,15 @@
 -(void) onErrorInfo:(NSString*) errorInfo;
 -(void) onStatusChanged:(NSString*) status;
 -(void) onLogUpdate;
+
+
+
+@property NotificationRefreshLevel notification_refreshLevel;
+
+
+
+#pragma mark - child class response notification
+-(void) refresh_ui;
+-(void) reload_data;
+-(void) clear_data;
 @end

RedAnt ERP Mobile/common/ActiveViewController.m

@@ -9,6 +9,8 @@
 #import "ActiveViewController.h"
 #import "config.h"
 #import "AppDelegate.h"
+//#import "NotificationNameCenter.h"
+
 @interface ActiveViewController ()
 
 @end
@@ -19,6 +21,13 @@
     [super viewDidLoad];
     
     self.refresh_type = REFRESH_DATA;
+    
+
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(OnRefreshUI:) name:RA_NOTIFICATION_REFRESH_UI object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(OnReloadData:) name:RA_NOTIFICATION_RELOAD_DATA object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(OnClearData:) name:RA_NOTIFICATION_CLEAR_DATA object:nil];
+    
+    
     // Do any additional setup after loading the view.
 }
 
@@ -131,4 +140,84 @@
 {
     
 }
+
+#pragma mark - Notification
+- (void)OnRefreshUI: (NSNotification *)notification
+{
+    NSDictionary* dict = [notification userInfo];
+    NSArray* arr= dict[@"receiver"];
+    if([arr indexOfObject:[self class_name]]==NSNotFound)
+        return;
+//    if([self class_name] isEqualToString:@"")
+    
+    if(self.notification_refreshLevel<NotificationRefreshLevelView)
+    {
+        if([self isVisible])
+        {
+            if([self respondsToSelector:@selector(refresh_ui)])
+                [self refresh_ui];
+        }
+        else
+        {
+            self.notification_refreshLevel = NotificationRefreshLevelView;
+        }
+    }
+}
+- (void)OnReloadData: (NSNotification *)notification
+{
+    NSDictionary* dict = [notification userInfo];
+    NSArray* arr= dict[@"receiver"];
+    if([arr indexOfObject:[self class_name]]==NSNotFound)
+        return;
+    
+    if(self.notification_refreshLevel<NotificationRefreshLevelData)
+    {
+        if([self isVisible])
+        {
+            if([self respondsToSelector:@selector(reload_data)])
+                [self reload_data];
+        }
+        else
+        {
+            self.notification_refreshLevel = NotificationRefreshLevelData;
+        }
+    }
+    
+}
+- (void)OnClearData: (NSNotification *)notification
+{
+    
+    if([self isVisible])
+    {
+        if([self respondsToSelector:@selector(clear_data)])
+        {
+            [self clear_data];
+            if([self respondsToSelector:@selector(refresh_ui)])
+                [self refresh_ui];
+        }
+    }
+    else
+    {
+        if([self respondsToSelector:@selector(clear_data)])
+        {
+            [self clear_data];
+            if(self.notification_refreshLevel<NotificationRefreshLevelView)
+                self.notification_refreshLevel = NotificationRefreshLevelView;
+        }
+    }
+
+    
+}
+#pragma mark - utils
+-(BOOL)isVisible
+{
+    return (self.isViewLoaded && self.view.window);
+}
+- (NSString *)class_name {
+
+        const char *class_name_ch = object_getClassName([self class]);
+
+
+    return [NSString stringWithUTF8String:class_name_ch];
+}
 @end

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -30,6 +30,7 @@
 #import "PriceSettingViewController.h"
 #import "JKLockController.h"
 #import "Singleton.h"
+#import "NotificationNameCenter.h"
 
 @interface MainViewController ()
 
@@ -126,6 +127,22 @@
 }
 -(void) reloadPortfolio:(BOOL) update_data immediately:(bool)immediately
 {
+#ifdef RA_NOTIFICATION
+    NSMutableDictionary* dict = [NSMutableDictionary new];
+    dict[@"receiver"]=@[@"PortfolioViewController"];
+    NSString* notificationname = nil;
+    if(update_data)
+        notificationname = RA_NOTIFICATION_RELOAD_DATA;
+    else
+        notificationname = RA_NOTIFICATION_REFRESH_UI;
+    NSNotification *notification =[NSNotification notificationWithName:notificationname object:nil userInfo:dict];
+    
+    //通过通知中心发送通知
+    
+    [[NSNotificationCenter defaultCenter] postNotification:notification];
+    return;
+    
+#endif
     
     if(immediately)
         [ self.portfolioViewController reload_container_getdata:update_data];

RedAnt ERP Mobile/common/Functions/signature/SignatureView.h

@@ -30,7 +30,7 @@
 
 
 //typedef void(^OkClick)(void);
-
+#define MAX_LINEWIDTH 12
 @interface SignatureView : GLKView
 
 @property (nonatomic, strong) UIColor *foregroundLineColor;

RedAnt ERP Mobile/common/Functions/signature/SignatureView.m

@@ -687,13 +687,27 @@ static PPSSignaturePoint ViewPointToGL(CGPoint viewPoint, CGRect bounds, GLKVect
         return nil;
     
     UIImage *screenshot = [self snapshot];
+    if(screenshot==nil)
+    {
+        int debug = 1;
+    }
+    float x = _mixPoint.x - MAX_LINEWIDTH /2.0;
+    float y = _mixPoint.y - MAX_LINEWIDTH / 2.0;
+    if(x<0)
+        x=0;
+    if(y<0)
+        y=0;
     
-    CGRect rect =  CGRectMake(_mixPoint.x*screenshot.scale, _mixPoint.y*screenshot.scale, (_maxPoint.x-_mixPoint.x)*screenshot.scale, (_maxPoint.y-_mixPoint.y)*screenshot.scale);
+    CGRect rect =  CGRectMake(x*screenshot.scale, y*screenshot.scale, (_maxPoint.x-_mixPoint.x+MAX_LINEWIDTH)*screenshot.scale, (_maxPoint.y-_mixPoint.y+MAX_LINEWIDTH)*screenshot.scale);
     
     CGImageRef imageRef=screenshot.CGImage;
     CGImageRef imagePartRef=CGImageCreateWithImageInRect(imageRef,rect);
     UIImage*cropImage=[UIImage imageWithCGImage:imagePartRef];
     CGImageRelease(imagePartRef);;
+    if(cropImage==nil)
+    {
+        int debug = 1;
+    }
     
     return cropImage;
 //    NSString *path =NSTemporaryDirectory();
@@ -733,7 +747,7 @@ static PPSSignaturePoint ViewPointToGL(CGPoint viewPoint, CGRect bounds, GLKVect
     [self updateRectWithPoint:l];
     if (t.state == UIGestureRecognizerStateRecognized) {
         
-        
+        self.isSigned = YES;
         NSLog(@"UIGestureRecognizerStateRecognized");
         glBindBuffer(GL_ARRAY_BUFFER, dotsBuffer);
         
@@ -787,6 +801,7 @@ static PPSSignaturePoint ViewPointToGL(CGPoint viewPoint, CGRect bounds, GLKVect
     
     CGPoint v = [p velocityInView:self];
     CGPoint l = [p locationInView:self];
+        [self updateRectWithPoint:l];
     
     currentVelocity = ViewPointToGL(v, self.bounds, (GLKVector3){0,0,0});
     float distance = 0.;

RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.m

@@ -22,6 +22,10 @@
     }
     return self;
 }
+-(BOOL) shouldAutorotate
+{
+    return false;
+}
 - (void)onBackClick:(UIButton *)sender {
     
     
@@ -183,10 +187,11 @@
 }
 - (void)onDone:(UIButton *)sender {
     
-    
+    NSLog(@"onDone");
     
     UIImage* img = [self.signatureView signatureImage];
 
+//    return ;
 //    CGSize imgsize = img.size;
     NSData* data = [self.signatureView signatureData];
     

RedAnt ERP Mobile/common/NotificationNameCenter.h

@@ -7,7 +7,12 @@
 //
 
 #import <UIKit/UIKit.h>
+typedef NS_ENUM(NSUInteger, NotificationRefreshLevel) {
 
+    NotificationRefreshLevelNone,
+    NotificationRefreshLevelView,
+    NotificationRefreshLevelData
+};
 @interface NotificationNameCenter : NSObject
 
 UIKIT_EXTERN  NSString  *LoginOK_HandleUrgencyFile_Notification;///<登陆成功处理恢复文件
@@ -22,4 +27,12 @@ UIKIT_EXTERN  NSString  *unLock_Permission_Notification;///<Customer解锁Order
 
 UIKIT_EXTERN  NSString  *User_LoginOK_Notification;///<用户登陆成功
 
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_REFRESH_UI;///<刷新界面
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_RELOAD_DATA;///<重新请求，加载数据
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_CLEAR_DATA;///<清空数据
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_SHOW_PRICE;///<隐藏价格
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_HIDE_PRICE;///<显示价格
+UIKIT_EXTERN  NSString  *RA_NOTIFICATION_SCANNER_DECODE;///<扫码返回结果
+
+
 @end

RedAnt ERP Mobile/common/NotificationNameCenter.m

@@ -22,4 +22,13 @@ const NSString  *unLock_Permission_Notification = @"unLock_Permission_Notificati
 
 const NSString  *User_LoginOK_Notification = @"User_LoginOK_Notification";
 
+
+const NSString  *RA_NOTIFICATION_REFRESH_UI = @"RA_NOTIFICATION_REFRESH_UI";
+const NSString  *RA_NOTIFICATION_RELOAD_DATA = @"RA_NOTIFICATION_RELOAD_DATA";
+const NSString  *RA_NOTIFICATION_SHOW_PRICE = @"RA_NOTIFICATION_SHOW_PRICE";
+const NSString  *RA_NOTIFICATION_HIDE_PRICE = @"RA_NOTIFICATION_HIDE_PRICE";
+const NSString  *RA_NOTIFICATION_SCANNER_DECODE = @"RA_NOTIFICATION_SCANNER_DECODE";
+const NSString  *RA_NOTIFICATION_CLEAR_DATA = @"RA_NOTIFICATION_CLEAR_DATA";
+
+
 @end

RedAnt ERP Mobile/iSales-UNITED WAVER.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>iSales-UWAVER.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/iSales-USAI.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-USAI.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 </dict>