Browse Source

修改signature 模块
限制线宽设置最大值
修复设置线宽后,没有立即生效的bug

Ray Zhang 7 years ago
parent
commit
bd27f18cae

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

@@ -202,7 +202,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.254863"
+            timestampString = "556511557.4889179"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1244"
@@ -218,7 +218,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.255408"
+            timestampString = "556511557.493077"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1231"
@@ -234,7 +234,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.255971"
+            timestampString = "556511557.493423"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1230"
@@ -266,7 +266,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.256557"
+            timestampString = "556511557.4938461"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1487"
@@ -282,7 +282,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.257171"
+            timestampString = "556511557.494205"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1210"
@@ -458,7 +458,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.258016"
+            timestampString = "556511557.494666"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1933"
@@ -474,7 +474,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.258701"
+            timestampString = "556511557.494929"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1962"
@@ -522,7 +522,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.259119"
+            timestampString = "556511557.495231"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1915"
@@ -570,7 +570,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.259594"
+            timestampString = "556511557.495585"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2549"
@@ -826,7 +826,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.261493"
+            timestampString = "556511557.4961571"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "2653"
@@ -842,7 +842,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.261808"
+            timestampString = "556511557.496435"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1246"
@@ -858,7 +858,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.262115"
+            timestampString = "556511557.4966871"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1232"
@@ -1002,7 +1002,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.26283"
+            timestampString = "556511557.497085"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1513"
@@ -1018,7 +1018,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.263109"
+            timestampString = "556511557.4973511"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1490"
@@ -1034,7 +1034,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.263387"
+            timestampString = "556511557.4976079"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1467"
@@ -1098,7 +1098,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006136.2642339"
+            timestampString = "556511557.497925"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1350"
@@ -1146,7 +1146,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556006326.09551"
+            timestampString = "556511557.498265"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1213"

+ 17 - 0
RedAnt ERP Mobile/common/Functions/signature/SignatureView.m

@@ -1060,6 +1060,23 @@ static PPSSignaturePoint ViewPointToGL(CGPoint viewPoint, CGRect bounds, GLKVect
     self.MaxLineWidth = width/400.0;
     self.MinLineWidth = width/400.0*0.4;
 //    self.foregroundLineWidth = width;
+    
+    
+//    currentVelocity = ViewPointToGL(v, self.bounds, (GLKVector3){0,0,0});
+//    float distance = 0.;
+//    if (previousPoint.x > 0) {
+//        distance = sqrtf((l.x - previousPoint.x) * (l.x - previousPoint.x) + (l.y - previousPoint.y) * (l.y - previousPoint.y));
+//    }
+//
+//    float velocityMagnitude = sqrtf(v.x*v.x + v.y*v.y);
+//    float clampedVelocityMagnitude = clamp(VELOCITY_CLAMP_MIN, VELOCITY_CLAMP_MAX, velocityMagnitude);
+//    float normalizedVelocity = (clampedVelocityMagnitude - VELOCITY_CLAMP_MIN) / (VELOCITY_CLAMP_MAX - VELOCITY_CLAMP_MIN);
+//
+    
+    penThickness = (self.MaxLineWidth - self.MinLineWidth)/2.0;
+//    float lowPassFilterAlpha = STROKE_WIDTH_SMOOTHING;
+//    float newThickness = (self.MaxLineWidth - self.MinLineWidth) * (1 - normalizedVelocity) + self.MinLineWidth;
+//    penThickness = penThickness * lowPassFilterAlpha + newThickness * (1 - lowPassFilterAlpha);
 }
 
 #pragma mark - Touch handlers

+ 6 - 1
RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.m

@@ -7,6 +7,7 @@
 //
 #define INTNUMBERS @"0123456789\n"
 #import "SignatureViewController.h"
+#import "RAUtils.h"
 //#import "const.h"
 @interface SignatureViewController ()
 
@@ -158,7 +159,11 @@
     }];
     
     UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Save" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-        
+        if(self.linewidth>16)
+        {
+            self.linewidth = 16;
+            [RAUtils message_alert:@"Line width set to 16." title:@"Line width should be less than 16" controller:self ];
+        }
         
             [self.signatureView setLineWidth:self.linewidth];
 //        UITextField *name = alertControl.textFields.firstObject;