From e9b9265a8dc3029cfce4a11ffda9831d69705fed Mon Sep 17 00:00:00 2001
From: zgy <173678978@qq.com>
Date: Mon, 22 Jan 2018 16:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DbadgeRadius=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84bug=EF=BC=8Cdemo=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E8=BF=99=E4=B8=AA=E5=B1=9E=E6=80=A7=20=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=B2=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WZLBadge/View/UIView+WZLBadge.m         |  4 ++++
 WZLBadgeDemo.xcodeproj/project.pbxproj  |  7 +++----
 WZLBadgeDemo/Base.lproj/Main.storyboard | 21 +++++++++++++--------
 WZLBadgeDemo/ViewController.m           |  4 ++++
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/WZLBadge/View/UIView+WZLBadge.m b/WZLBadge/View/UIView+WZLBadge.m
index ef8fb91..992caa2 100644
--- a/WZLBadge/View/UIView+WZLBadge.m
+++ b/WZLBadge/View/UIView+WZLBadge.m
@@ -159,6 +159,10 @@ - (void)badgeInit
     
     if (nil == self.badge) {
         CGFloat redotWidth = kWZLBadgeDefaultRedDotRadius *2;
+        if (self.badgeRadius) {
+            redotWidth = self.badgeRadius *2;
+        }
+        
         CGRect frm = CGRectMake(CGRectGetWidth(self.frame), -redotWidth, redotWidth, redotWidth);
         self.badge = [[UILabel alloc] initWithFrame:frm];
         self.badge.textAlignment = NSTextAlignmentCenter;
diff --git a/WZLBadgeDemo.xcodeproj/project.pbxproj b/WZLBadgeDemo.xcodeproj/project.pbxproj
index 1d255cb..c7f4038 100644
--- a/WZLBadgeDemo.xcodeproj/project.pbxproj
+++ b/WZLBadgeDemo.xcodeproj/project.pbxproj
@@ -115,8 +115,7 @@
 				19AD4E881BB3D4600059AA66 /* UITabBarItem+WZLBadge.h */,
 				19AD4E891BB3D4600059AA66 /* UITabBarItem+WZLBadge.m */,
 			);
-			name = BarItem;
-			path = BarButtonItem;
+			path = BarItem;
 			sourceTree = "<group>";
 		};
 		1968600A1B78AB4A00AD10C2 /* View */ = {
@@ -491,7 +490,7 @@
 					/Users/user/Desktop/Git/WuJieCaoJoke/WuJieCaoJoke/ThirdPart/ThirdPlatform/UMeng/umeng_ios_social_sdk_4.2.3_arm64_custom/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI,
 				);
 				INFOPLIST_FILE = WZLBadgeDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -528,7 +527,7 @@
 					/Users/user/Desktop/Git/WuJieCaoJoke/WuJieCaoJoke/ThirdPart/ThirdPlatform/UMeng/umeng_ios_social_sdk_4.2.3_arm64_custom/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI,
 				);
 				INFOPLIST_FILE = WZLBadgeDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/WZLBadgeDemo/Base.lproj/Main.storyboard b/WZLBadgeDemo/Base.lproj/Main.storyboard
index b71455b..63358ce 100644
--- a/WZLBadgeDemo/Base.lproj/Main.storyboard
+++ b/WZLBadgeDemo/Base.lproj/Main.storyboard
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="nPv-CI-Xkq">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nPv-CI-Xkq">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->
@@ -10,7 +14,7 @@
             <objects>
                 <navigationController id="nPv-CI-Xkq" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Fx2-Ej-wk7">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -30,17 +34,18 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="WZLBadgeDemo" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ySJ-DU-qSP">
                                 <rect key="frame" x="25" y="449" width="207" height="53"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <tabBarItem key="tabBarItem" title="Item1" id="7FX-PP-AfN"/>
                     <navigationItem key="navigationItem" id="dmp-0O-F8n"/>
@@ -58,7 +63,7 @@
                     <tabBar key="tabBar" contentMode="scaleToFill" id="IxV-HF-luf">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                     </tabBar>
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="FFV-hy-4eO" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/WZLBadgeDemo/ViewController.m b/WZLBadgeDemo/ViewController.m
index dc310fb..084ef53 100644
--- a/WZLBadgeDemo/ViewController.m
+++ b/WZLBadgeDemo/ViewController.m
@@ -63,6 +63,10 @@ - (NSMutableArray *)prepareDataItems
         btn.tag = 1000;
         [btn setImage:[UIImage imageNamed:@"logo.jpg"] forState:UIControlStateNormal];
         btn.layer.cornerRadius = btn.width / 2;
+        
+        if (i == 0) {
+            btn.badgeRadius = 2;
+        }
         if (i == 1) {
             btn.badgeBgColor = [UIColor purpleColor];
             btn.badgeCenterOffset = CGPointMake(-btn.width, 0);