Explorar el Código

1.修改iOS Apex Mobile KPI小于10%不显示文字。

Pen Li hace 8 años
padre
commit
2238d046e9

+ 7 - 15
Apex Mobile/Apex Mobile/KPICell.m

@@ -19,9 +19,8 @@
 @property (strong, nonatomic) IBOutlet UILabel *containerLB;
 @property (strong, nonatomic) IBOutlet UILabel *teuLB;
 @property (strong, nonatomic) IBOutlet UILabel *TitleLB;
-@property (strong, nonatomic) IBOutlet UILabel *nameLB;
-@property (strong, nonatomic) IBOutlet UILabel *countLB;
-@property (strong, nonatomic) IBOutlet UILabel *percentLB;
+
+@property (strong, nonatomic) IBOutlet UILabel *selectedInfoLB;
 @property (strong, nonatomic) IBOutlet XYPieChartView *KPIView;
 @property (strong, nonatomic) IBOutlet UIView *itemsContainer;
 @property (strong, nonatomic) IBOutlet NSLayoutConstraint *KPIHeightConstraint;
@@ -153,8 +152,7 @@
     [super awakeFromNib];
     // Initialization code
     
-    // 当有一项数据的百分比小于你所校验的数值时,会将该项数值百分比移出饼图展示(校验数值从0~100)
-    [self.KPIView setCheckLessThanPercent:10];
+
     self.KPIView.delegate = self;
     
     self.shipmentLB.text = nil;
@@ -162,9 +160,7 @@
     self.teuLB.text = nil;
     
     self.TitleLB.text = nil;
-    self.nameLB.text = nil;
-    self.countLB.text = nil;
-    self.percentLB.text = nil;
+    self.selectedInfoLB.text = nil;
     
     CGFloat w = [UIScreen mainScreen].bounds.size.width;
     CGFloat h = [UIScreen mainScreen].bounds.size.height;
@@ -247,15 +243,11 @@
 -(void) showDetail:(XYPieChartView *)pieChartView index:(NSInteger)index selectedType:(NSDictionary *)selectedType {
     if(selectedType == nil)
     {
-        self.nameLB.text = nil;
-        self.countLB.text = nil;
-        self.percentLB.text = nil;
+        self.selectedInfoLB.text = nil;
         return;
     }
-    
-    self.nameLB.text = selectedType[@"full_title"];
-    self.countLB.text = selectedType[@"A_val"];
-    self.percentLB.text = [NSString stringWithFormat:@"%@%%",selectedType[@"CP_val"]];
+
+    self.selectedInfoLB.text = [NSString stringWithFormat:@"%@ %@ %@%%",selectedType[@"full_title"],selectedType[@"A_val"],selectedType[@"CP_val"]];
     
 }
 

+ 7 - 27
Apex Mobile/Apex Mobile/Main.storyboard

@@ -324,15 +324,6 @@
                                                     <rect key="frame" x="0.0" y="337" width="374" height="190"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 </view>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="7 Days" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a70-xK-8Gt">
-                                                    <rect key="frame" x="113.5" y="57.5" width="49" height="19.5"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="height" constant="19.5" id="77T-V5-J6j"/>
-                                                    </constraints>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This Month" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TdU-EN-0bl">
                                                     <rect key="frame" x="5" y="8" width="86" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -345,14 +336,11 @@
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3855" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZTm-4z-LAb">
-                                                    <rect key="frame" x="167.5" y="57.5" width="39" height="19.5"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="48.5%" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nqS-Pj-374">
-                                                    <rect key="frame" x="211.5" y="57.5" width="46" height="19.5"/>
+                                                    <rect key="frame" x="164" y="58" width="46" height="20"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="20" id="Jme-st-oMg"/>
+                                                    </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -385,8 +373,6 @@
                                             </subviews>
                                         </view>
                                         <constraints>
-                                            <constraint firstItem="nqS-Pj-374" firstAttribute="leading" secondItem="ZTm-4z-LAb" secondAttribute="trailing" constant="5" id="0x8-cx-doQ"/>
-                                            <constraint firstItem="ZTm-4z-LAb" firstAttribute="leading" secondItem="a70-xK-8Gt" secondAttribute="trailing" constant="5" id="1WX-Hv-nRD"/>
                                             <constraint firstAttribute="bottom" secondItem="Fzk-UY-Jay" secondAttribute="bottom" id="1Y6-qV-4be"/>
                                             <constraint firstAttribute="trailing" secondItem="Fzk-UY-Jay" secondAttribute="trailing" id="4ue-Uk-9c4"/>
                                             <constraint firstItem="TdU-EN-0bl" firstAttribute="top" secondItem="hOk-Q6-U2Y" secondAttribute="topMargin" id="8Dy-Pp-5Km"/>
@@ -396,24 +382,20 @@
                                             <constraint firstItem="SiU-f3-vg5" firstAttribute="height" secondItem="5BU-lo-4qt" secondAttribute="height" id="HDa-AP-k8s"/>
                                             <constraint firstItem="NEW-gP-kfO" firstAttribute="bottom" secondItem="aTr-Mi-Mg3" secondAttribute="bottom" id="IF9-dO-PCB"/>
                                             <constraint firstItem="nqS-Pj-374" firstAttribute="top" secondItem="SiU-f3-vg5" secondAttribute="bottom" constant="7" id="K1A-lf-3l3"/>
-                                            <constraint firstItem="ZTm-4z-LAb" firstAttribute="centerX" secondItem="hOk-Q6-U2Y" secondAttribute="centerX" id="M6w-jZ-sEd"/>
+                                            <constraint firstItem="aTr-Mi-Mg3" firstAttribute="top" secondItem="nqS-Pj-374" secondAttribute="bottom" constant="4" id="MMZ-ga-uX8"/>
                                             <constraint firstItem="aTr-Mi-Mg3" firstAttribute="centerX" secondItem="hOk-Q6-U2Y" secondAttribute="centerX" id="NJD-sL-lZu"/>
                                             <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="SiU-f3-vg5" secondAttribute="trailing" id="Oqq-Mo-cDQ"/>
-                                            <constraint firstItem="nqS-Pj-374" firstAttribute="height" secondItem="ZTm-4z-LAb" secondAttribute="height" id="P83-8U-2dM"/>
                                             <constraint firstItem="NEW-gP-kfO" firstAttribute="width" secondItem="5at-hb-Z6F" secondAttribute="width" id="Pt4-h9-f63"/>
                                             <constraint firstItem="TdU-EN-0bl" firstAttribute="leading" secondItem="hOk-Q6-U2Y" secondAttribute="leading" constant="5" id="RCu-sb-u2d"/>
                                             <constraint firstItem="5BU-lo-4qt" firstAttribute="centerY" secondItem="HR2-MW-QBD" secondAttribute="centerY" id="aJp-oe-BEb"/>
-                                            <constraint firstItem="ZTm-4z-LAb" firstAttribute="centerY" secondItem="a70-xK-8Gt" secondAttribute="centerY" id="b4F-fq-tih"/>
                                             <constraint firstItem="HR2-MW-QBD" firstAttribute="leading" secondItem="hOk-Q6-U2Y" secondAttribute="leading" id="c5e-3z-YkJ"/>
                                             <constraint firstItem="SiU-f3-vg5" firstAttribute="centerY" secondItem="5BU-lo-4qt" secondAttribute="centerY" id="cUe-lI-M8w"/>
                                             <constraint firstItem="5BU-lo-4qt" firstAttribute="height" secondItem="HR2-MW-QBD" secondAttribute="height" id="epV-Od-GWW"/>
                                             <constraint firstItem="Fzk-UY-Jay" firstAttribute="top" secondItem="aTr-Mi-Mg3" secondAttribute="bottom" constant="5" id="jpV-Oc-1y7"/>
                                             <constraint firstItem="5at-hb-Z6F" firstAttribute="bottom" secondItem="aTr-Mi-Mg3" secondAttribute="bottom" id="nie-Ua-1Nc"/>
-                                            <constraint firstItem="ZTm-4z-LAb" firstAttribute="height" secondItem="a70-xK-8Gt" secondAttribute="height" id="nl5-T3-U8t"/>
-                                            <constraint firstItem="nqS-Pj-374" firstAttribute="centerY" secondItem="ZTm-4z-LAb" secondAttribute="centerY" id="oIx-OR-2oK"/>
                                             <constraint firstItem="Fzk-UY-Jay" firstAttribute="leading" secondItem="hOk-Q6-U2Y" secondAttribute="leading" id="qeg-tq-EXd"/>
-                                            <constraint firstItem="aTr-Mi-Mg3" firstAttribute="top" secondItem="a70-xK-8Gt" secondAttribute="bottom" constant="5" id="t98-6j-bka"/>
                                             <constraint firstItem="5at-hb-Z6F" firstAttribute="top" secondItem="aTr-Mi-Mg3" secondAttribute="top" id="tTr-R5-M9c"/>
+                                            <constraint firstItem="nqS-Pj-374" firstAttribute="centerX" secondItem="hOk-Q6-U2Y" secondAttribute="centerX" id="vxF-gO-wHr"/>
                                             <constraint firstItem="5BU-lo-4qt" firstAttribute="leading" secondItem="HR2-MW-QBD" secondAttribute="trailing" constant="5" id="xRF-a6-woN"/>
                                             <constraint firstAttribute="trailing" secondItem="NEW-gP-kfO" secondAttribute="trailing" constant="5" id="yZV-ui-z0C"/>
                                             <constraint firstItem="SiU-f3-vg5" firstAttribute="leading" secondItem="5BU-lo-4qt" secondAttribute="trailing" constant="5" id="ydy-jS-Fh6"/>
@@ -422,10 +404,8 @@
                                             <outlet property="KPIHeightConstraint" destination="VQp-Nn-Hkb" id="Mkc-e4-eDe"/>
                                             <outlet property="KPIView" destination="aTr-Mi-Mg3" id="vVK-Al-vdn"/>
                                             <outlet property="containerLB" destination="5BU-lo-4qt" id="oEX-rp-eq2"/>
-                                            <outlet property="countLB" destination="ZTm-4z-LAb" id="qWj-zE-3Nv"/>
                                             <outlet property="itemsContainer" destination="Fzk-UY-Jay" id="Ywd-mh-Ztp"/>
-                                            <outlet property="nameLB" destination="a70-xK-8Gt" id="bLJ-Xt-ca1"/>
-                                            <outlet property="percentLB" destination="nqS-Pj-374" id="tXU-zD-s2Q"/>
+                                            <outlet property="selectedInfoLB" destination="nqS-Pj-374" id="OCq-CG-aYw"/>
                                             <outlet property="shipmentLB" destination="HR2-MW-QBD" id="Wxb-do-sCz"/>
                                             <outlet property="teuLB" destination="SiU-f3-vg5" id="9Pn-rA-bkJ"/>
                                         </connections>

+ 4 - 0
Apex Mobile/Apex Mobile/PieChart/XYPieChartView.m

@@ -250,6 +250,10 @@
     [self addSubview:self.centerButton];
     
     self.backgroundColor = [UIColor clearColor];
+    
+    
+    // 当有一项数据的百分比小于你所校验的数值时,会将该项数值百分比移出饼图展示(校验数值从0~100)
+    [self setCheckLessThanPercent:10];
 }
 
 - (id)initWithFrame:(CGRect)frame withPieChartData:(NSMutableDictionary *)pieChartData