Apex Mobile

修复KPI 查询参数错误
修复饼图触摸闪退的bug
登陆界面版本号加上大版本号

Ants Contract/AntsContract.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Apex Mobile/Apex Mobile.xcodeproj/project.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Expressions.xcexplist

@@ -56,9 +56,31 @@
             </PersistentString>
          </PersistentStrings>
       </ContextState>
+      <ContextState
+         contextName = "__33-[XYRenderView updateTimerFired:]_block_invoke:XYRenderView.m">
+      </ContextState>
       <ContextState
          contextName = "-[LocationViewController mapView:didTapInfoWindowOfMarker:]:LocationViewController.m">
       </ContextState>
+      <ContextState
+         contextName = "-[XYRenderView setSliceSelectedAtIndex:]:XYRenderView.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "_pieView.layer.sublayers.count">
+            </PersistentString>
+            <PersistentString
+               value = "_pieView.layer.sublayers">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
+      <ContextState
+         contextName = "-[XYRenderView canshowLabel:LabelLayer:]:XYRenderView.m">
+         <PersistentStrings>
+            <PersistentString
+               value = "labelLayer.string">
+            </PersistentString>
+         </PersistentStrings>
+      </ContextState>
       <ContextState
          contextName = "-[ResultViewController getActions]:ResultViewController.m">
       </ContextState>

Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/ResultViewController.m"
-            timestampString = "545629985.836307"
+            timestampString = "546329752.028227"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "529"
@@ -26,7 +26,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/ResultViewController.m"
-            timestampString = "545629985.836482"
+            timestampString = "546329752.02871"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "178"
@@ -42,7 +42,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/ResultViewController.m"
-            timestampString = "545629985.83689"
+            timestampString = "546329752.028833"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "488"
@@ -58,7 +58,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "../common/customUI/ResultViewController.m"
-            timestampString = "545629985.836973"
+            timestampString = "546329752.028942"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "175"
@@ -74,11 +74,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.198139"
+            timestampString = "546336188.514961"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "754"
-            endingLineNumber = "754"
+            startingLineNumber = "800"
+            endingLineNumber = "800"
             landmarkName = "-updateLabelForLayer:value:"
             landmarkType = "7">
          </BreakpointContent>
@@ -90,11 +90,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.198555"
+            timestampString = "546336188.51531"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "727"
-            endingLineNumber = "727"
+            startingLineNumber = "773"
+            endingLineNumber = "773"
             landmarkName = "-createSliceLayer"
             landmarkType = "7">
          </BreakpointContent>
@@ -106,11 +106,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.1988389"
+            timestampString = "546336188.515386"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "728"
-            endingLineNumber = "728"
+            startingLineNumber = "774"
+            endingLineNumber = "774"
             landmarkName = "-createSliceLayer"
             landmarkType = "7">
          </BreakpointContent>
@@ -122,11 +122,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.199103"
+            timestampString = "546336188.515451"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "753"
-            endingLineNumber = "753"
+            startingLineNumber = "799"
+            endingLineNumber = "799"
             landmarkName = "-updateLabelForLayer:value:"
             landmarkType = "7">
          </BreakpointContent>
@@ -138,11 +138,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.199353"
+            timestampString = "546336188.515514"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "770"
-            endingLineNumber = "770"
+            startingLineNumber = "816"
+            endingLineNumber = "816"
             landmarkName = "-updateLabelForLayer:value:"
             landmarkType = "7">
          </BreakpointContent>
@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.199599"
+            timestampString = "546336188.515583"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "771"
-            endingLineNumber = "771"
+            startingLineNumber = "817"
+            endingLineNumber = "817"
             landmarkName = "-updateLabelForLayer:value:"
             landmarkType = "7">
          </BreakpointContent>
@@ -170,7 +170,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.199842"
+            timestampString = "546336188.515646"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "233"
@@ -186,7 +186,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.2000771"
+            timestampString = "546336188.51571"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "214"
@@ -202,14 +202,318 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/PieChart/XYRenderView.m"
-            timestampString = "546233351.200312"
+            timestampString = "546336188.5157731"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "762"
-            endingLineNumber = "762"
+            startingLineNumber = "808"
+            endingLineNumber = "808"
             landmarkName = "-updateLabelForLayer:value:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRotatedView.m"
+            timestampString = "546336188.515837"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "415"
+            endingLineNumber = "415"
+            landmarkName = "-animateFinish:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.5160559"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "299"
+            endingLineNumber = "299"
+            landmarkName = "-reloadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRotatedView.m"
+            timestampString = "546336188.516126"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "99"
+            endingLineNumber = "99"
+            landmarkName = "-reloadPie"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/KPICell.m"
+            timestampString = "546336188.5161771"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "37"
+            endingLineNumber = "37"
+            landmarkName = "-setInfoDic:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/HomeViewController.m"
+            timestampString = "546336188.516387"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "573"
+            endingLineNumber = "573"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/LoginViewController.m"
+            timestampString = "546336188.516603"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "160"
+            endingLineNumber = "160"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.516796"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "260"
+            endingLineNumber = "260"
+            landmarkName = "-setSliceSelectedAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.516863"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "509"
+            endingLineNumber = "509"
+            landmarkName = "-canshowLabel:LabelLayer:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.516923"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "262"
+            endingLineNumber = "262"
+            landmarkName = "-setSliceSelectedAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.5169801"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "498"
+            endingLineNumber = "498"
+            landmarkName = "-canshowLabel:LabelLayer:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.517032"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "499"
+            endingLineNumber = "499"
+            landmarkName = "-canshowLabel:LabelLayer:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.517083"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "497"
+            endingLineNumber = "497"
+            landmarkName = "-canshowLabel:LabelLayer:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.517134"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "554"
+            endingLineNumber = "554"
+            landmarkName = "-updateTimerFired:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRotatedView.m"
+            timestampString = "546336188.51718"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "356"
+            endingLineNumber = "356"
+            landmarkName = "-touchesMoved:withEvent:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.517225"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "287"
+            endingLineNumber = "287"
+            landmarkName = "-setSliceDeselectedAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.51727"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "722"
+            endingLineNumber = "722"
+            landmarkName = "-notifyDelegateOfSelectionChangeFrom:to:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.517314"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "259"
+            endingLineNumber = "259"
+            landmarkName = "-setSliceSelectedAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.517357"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "286"
+            endingLineNumber = "286"
+            landmarkName = "-setSliceDeselectedAtIndex:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/PieChart/XYRenderView.m"
+            timestampString = "546336188.5174"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "721"
+            endingLineNumber = "721"
+            landmarkName = "-notifyDelegateOfSelectionChangeFrom:to:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSLocationWhenInUseUsageDescription</key>
-    <string>User can check local Apex Office</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -19,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.01</string>
+	<string>2.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>180318</string>
+	<string>180425</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -33,6 +31,8 @@
 	</dict>
 	<key>NSContactsUsageDescription</key>
 	<string>Allow user add Apex Maritime agency as contact</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>User can check local Apex Office</string>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

Apex Mobile/Apex Mobile/HomeViewController.m

@@ -679,7 +679,7 @@ typedef enum {
     
     
     NSMutableDictionary *params = [@{
-                                     @"s_kpi" : @(YES),
+                                     @"is_kpi" : @(YES),
                                      @"name"  : kpi_name,
                                      @"sector": sector,
                                      @"module_name" : module_name

Apex Mobile/Apex Mobile/KPIRepeatTapGestureRecognizer.m

@@ -22,7 +22,7 @@
     [super touchesEnded:touches withEvent:event];
     
     __weak typeof(self) weakSelf = self;
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         if (weakSelf) {
             __strong typeof(weakSelf) strongSelf = weakSelf;
             if (strongSelf.state != UIGestureRecognizerStateRecognized) {

Apex Mobile/Apex Mobile/LoginViewController.m

@@ -154,8 +154,10 @@
     self.mum.backgroundColor = [UIColor clearColor];
     
     NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
+    
+    NSString* shortNum =[infoDict objectForKey:@"CFBundleShortVersionString"];
     NSString* versionNum =[infoDict objectForKey:@"CFBundleVersion"];
-    versionNum = [NSString stringWithFormat:@"ver:A%@",versionNum];
+    versionNum = [NSString stringWithFormat:@"ver:%@.A%@",shortNum,versionNum];
     
     self.verLabel.text = versionNum;
 }

Apex Mobile/Apex Mobile/PieChart/XYRenderView.m

@@ -255,6 +255,8 @@ static CGPathRef CGPathCreateArc(CGPoint center, CGFloat radius, CGFloat startAn
         return;
     }
     
+    if(index>=_pieView.layer.sublayers.count)
+        return;
     SliceLayer *layer = (SliceLayer*)[_pieView.layer.sublayers objectAtIndex:index];
     
     if (layer) {
@@ -280,7 +282,8 @@ static CGPathRef CGPathCreateArc(CGPoint center, CGFloat radius, CGFloat startAn
         
         return;
     }
-    
+    if(index>=_pieView.layer.sublayers.count)
+        return;
     SliceLayer *layer = (SliceLayer*)[_pieView.layer.sublayers objectAtIndex:index];
     
     if (layer) {
@@ -481,6 +484,39 @@ static CGPathRef CGPathCreateArc(CGPoint center, CGFloat radius, CGFloat startAn
 
 #pragma mark - Animation Delegate + Run Loop Timer
 
+-(bool)canshowLabel:(SliceLayer*)sliceLayer LabelLayer:(CATextLayer*)labelLayer
+{
+
+    
+//     [self convertPoint:point toView:view.superview];
+    
+    
+    
+    
+//    CGPathCreateCopy(sliceLayer.path);
+   // CGPoint p = [labelLayer convertPoint:labelLayer.position toLayer:sliceLayer];
+    CGRect rect = labelLayer.frame;// [labelLayer convertRect:labelLayer.frame toLayer:sliceLayer];//labelLayer.bounds;
+    CGPathRef path =sliceLayer.path;
+    
+    UIBezierPath *path1 = [UIBezierPath bezierPathWithRect:rect];
+    CAShapeLayer *pathLayer1 = [CAShapeLayer layer];
+    pathLayer1.lineWidth = 2;
+    pathLayer1.strokeColor = [UIColor blueColor].CGColor;
+    pathLayer1.path = path1.CGPath;
+    pathLayer1.fillColor = [UIColor blackColor].CGColor; // 默认为blackColor
+    [sliceLayer addSublayer:pathLayer1];
+    
+    bool ba=CGPathContainsPoint(path, NULL, CGPointMake(rect.origin.x, rect.origin.y), false);
+    bool bb=CGPathContainsPoint(path, NULL, CGPointMake(rect.origin.x+rect.size.width, rect.origin.y), false);
+    bool bc=CGPathContainsPoint(path, NULL, CGPointMake(rect.origin.x+rect.size.width, rect.origin.y-rect.size.height), false);
+    bool bd=CGPathContainsPoint(path, NULL, CGPointMake(rect.origin.x, rect.origin.y-rect.size.height), false);
+    return ba&&bb&&bc&&bd;
+//    NSLog(@"in the path a %@",[NSNumber numberWithBool:ba&&bb&&bc&&bd]);
+//    bool b1=[path containsPoint:CGPointMake(rect.origin.x, rect.origin.y)];
+//    bool b2=[path containsPoint:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y)];
+//    bool b3=[path containsPoint:CGPointMake(rect.origin.x+rect.size.width, rect.origin.y+rect.size.height)];
+//    bool b4=[path containsPoint:CGPointMake(rect.origin.x, rect.origin.y+rect.size.height)];
+}
 - (void)updateTimerFired:(NSTimer *)timer;
 {
     CALayer *parentLayer = [_pieView layer];
@@ -506,6 +542,14 @@ static CGPathRef CGPathCreateArc(CGPoint center, CGFloat radius, CGFloat startAn
             [CATransaction setDisableActions:YES];
             
             if (layer.percentage < self.checkLessPercent) {
+                
+//                float labelLayerX = _pieCenter.x + (_labelRadius * cos(interpolatedMidAngle));
+//
+//                float labelLayerY = _pieCenter.y + (_labelRadius * sin(interpolatedMidAngle));
+//
+//                [labelLayer setPosition:CGPointMake(labelLayerX * 1, labelLayerY * 1)];
+//                labelLayer.backgroundColor = [UIColor blackColor].CGColor;
+//                bool canshow = [self canshowLabel:layer LabelLayer:labelLayer];
                 labelLayer.hidden = true;
                 //小于百分比不绘制
 //
@@ -673,6 +717,8 @@ static CGPathRef CGPathCreateArc(CGPoint center, CGFloat radius, CGFloat startAn
     }
     else if (newSelection != -1)
     {
+        if(newSelection>=_pieView.layer.sublayers.count)
+            return;
         SliceLayer *layer = (SliceLayer*)[_pieView.layer.sublayers objectAtIndex:newSelection];
         if(_selectedSliceOffsetRadius > 0 && layer){
             
@@ -759,7 +805,7 @@ static CGPathRef CGPathCreateArc(CGPoint center, CGFloat radius, CGFloat startAn
     // 百分比预留小数点后一位
     label = [NSString stringWithFormat:@"%.1f%%", pieLayer.percentage];
     
-    label = [label stringByReplacingOccurrencesOfString:@".0%" withString:@"%"];
+    label = [label stringByReplacingOccurrencesOfString:@"100.0%" withString:@"100%"];
     
     NSDictionary *attributes = @{NSFontAttributeName: [UIFont fontWithName:@"HelveticaNeue" size:13]};