优化小红点图片提示、优化部分代码

Lighting/Class/FullScreen/FullScreenViewController.m

@@ -30,6 +30,7 @@
 
 static NSString * const reuseIdentifier = @"Cell";
 
+
 #pragma mark -初始化
 - (instancetype)init
 {
@@ -46,6 +47,7 @@ static NSString * const reuseIdentifier = @"Cell";
     return [super initWithCollectionViewLayout:layout];
 }
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     

Lighting/Class/Login/Controller/LoginViewController.m

@@ -194,13 +194,11 @@
     SHARED_APPDELEGATE.lineView.hidden = YES;
     NSInteger selectedIndex = 7;
     if ([Name isEqualToString:@"体验中心"]) {
- 
         [Notification postNotificationName:OPENFOLLOWHEARTVC object:nil];
         return;
         
     }else if ([Name isEqualToString:@"体验中心3D"])
     {
-
         [Notification postNotificationName:OPENFOLLOWHEART3DVC object:nil];
         return;
     }

Lighting/Class/MyClient/Controller/ClientViewController.m

@@ -67,6 +67,7 @@
     [super viewDidLoad];
     
     [self addaddObserver];
+    [self uiConfigAction];
 }
 
 - (void)viewDidAppear:(BOOL)animated
@@ -117,7 +118,6 @@
 
 #pragma mark -省市区选择
 - (IBAction)addressChooseButtonClickAction:(UIButton *)sender {
-    
     [[MOFSPickerManager shareManger] showMOFSAddressPickerWithTitle:@"选择城市" cancelTitle:@"取消" commitTitle:@"完成" commitBlock:^(NSString *address, NSString *zipcode) {
         [sender setTitle:address forState:UIControlStateNormal];
         [self.changePersonInformationButton setTitle:@"保存" forState:UIControlStateNormal];
@@ -225,7 +225,6 @@
     return 100;
 }
 
-
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     ClientdetailsViewController *clientdetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"clientdetails"];

Lighting/Class/RIghtVC/SceneLibraryVC/Controller/SceneLibraryViewController.m

@@ -180,7 +180,6 @@
     [self presentViewController:fullScreenVC animated:YES completion:nil];
 }
 
-
 #pragma mark -切换显示风格
 - (IBAction)SwitchdisplayStyleClick:(UIButton *)sender {
     
@@ -188,7 +187,6 @@
     [self showPopoverViewController:CGSizeMake(55, 180) Withdatas:self.imageArray ShowButton:sender SelectedIndex:100];
 }
 
-
 #pragma mark -筛选风格
 - (void)screeningstyleButtonClick:(UIButton *)sender {
 
@@ -200,7 +198,6 @@
     [self showPopoverViewController:CGSizeMake(150, 200) Withdatas:styleArray ShowButton:sender SelectedIndex:0];
 }
 
-
 #pragma mark -空间风格
 - (void)HousestyleButtonClick:(UIButton *)sender {
     
@@ -239,12 +236,10 @@
 {
     //空间code
     if (selected) {
-        
         self.conditionModel.spaceEquals = type;
         [self.spaceButton setTitle:[title isEqualToString:@"全部"]?@"空间":title forState:UIControlStateNormal];
     }else
     {//风格code
-        
         self.conditionModel.styleEquals = type;
         [self.styleButton setTitle:[title isEqualToString:@"全部"]?@"风格":title forState:UIControlStateNormal];
     }

Lighting/Class/Tabbar/CustomTabbar/CustomTabbarController.m

@@ -144,10 +144,10 @@
         if ([controllString isEqualToString:@"AnnouncementViewController"] || [controllString isEqualToString:@"MessageViewController"]) {
             storyboard = [BaseViewController getAnnouncementStoryboardClass];
         } else if ([controllString isEqualToString:@"LearningCenterMainViewController"]) {
-            // 学习中心
+        // 学习中心
             storyboard = [BaseViewController getLearningCenterStoryboardClass];
         } else if ([controllString isEqualToString:@"GuideIntegralViewController"]) {
-            // 积分
+        // 积分
             storyboard = [BaseViewController getGuideIntegralStoryboardClass];
         } else {
             storyboard = [BaseViewController getMainStoryboardClass];
@@ -179,11 +179,8 @@
     [self dismissViewControllerAnimated:NO completion:nil];
     _Newbutton = button;
     switch (Buttontag) {
-
         case MENU:
-
             [SHARED_APPDELEGATE.mmdrawer toggleDrawerSide:MMDrawerSideRight animated:YES completion:nil];
-
             break;
         case MESSAGE: {
             self.selectedIndex = 7;
@@ -192,7 +189,6 @@
             self.selectedIndex = 6;
         } break;
         case SHOPPING_GUIDE:
-
         {
             UserViewController *userVC = [[UserViewController alloc] init];
             userVC.delegate = self;
@@ -205,27 +201,22 @@
             [self presentViewController:userVC animated:YES completion:nil];
         } break;
         case CUSTOMER:
-
             self.selectedIndex = 3;
-
             break;
         case SHOPPING_CAR:
             //必须设置当前客户才能跳转到购物车
             if (![Shoppersmanager manager].currentCustomer) {
-
                 [XBLoadingView showHUDViewWithText:@"必须设置当前客户才能访问购物车"];
             } else {
-
                 self.selectedIndex = 2;
             }
-
             break;
-
         default:
             break;
     }
 }
 
+
 #pragma mark -修改密码点击
 - (void)changPasswordButtonClick {
     [self dismissViewControllerAnimated:NO
@@ -258,6 +249,7 @@
                              }];
 }
 
+
 #pragma mark -二维码扫描
 - (void)qrcodeButtonClick {
     WS(weakSelf);
@@ -336,7 +328,6 @@
     webView.type = Announcement;
     webView.urlString = [NSString stringWithFormat:BAJIE3D,user.fid,shopper.employee.departid,shopper.employee.fid];
     [self presentViewController:webView animated:YES completion:nil];
-    
 }
 
 

Lighting/Class/Tabbar/CustomToolView/Toolview.m

@@ -17,11 +17,9 @@
 
 @implementation Toolview
 
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
-      
         self.backgroundColor = RGB(255, 255, 255,1);
         [self uiConfigAction];
         [self addNSNotificationCenter];
@@ -36,14 +34,12 @@
     self.layer.shadowColor = [UIColor blackColor].CGColor;
     self.layer.shadowRadius = 10;
     self.layer.shadowOpacity = 0.5;
-
     //图标
     UIImageView *iconImage = [[UIImageView alloc]initWithFrame:CGRectMake(50, 13, 115, 35)];
     iconImage.image = TCImage(@"欧");
     iconImage.userInteractionEnabled = YES;
     [iconImage addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(showHomeController)]];
     [self addSubview:iconImage];
-    
     //输入框背景
     UIView *backView = [[UIView alloc]initWithFrame:CGRectMake(200, (NavigationHeight-35)/2, 220, 35)];
     backView.backgroundColor = RGB(242, 242, 242,1);
@@ -52,12 +48,10 @@
     backView.layer.borderWidth = 1;
     backView.layer.borderColor = RGB(209, 209, 209,1).CGColor;
     [self addSubview:backView];
-
     //搜索图标
     UIImageView *imageview = [[UIImageView alloc]initWithFrame:CGRectMake(10, 7.5, 20, 20)];
     imageview.image = TCImage(@"search");
     [backView addSubview:imageview];
-    
     //输入框
     self.inputField = [[UITextField alloc]initWithFrame:CGRectMake(45, 0, 170, 35)];
     self.inputField.borderStyle = UITextBorderStyleNone;
@@ -65,21 +59,18 @@
     self.inputField.font = [UIFont systemFontOfSize:12];
     self.inputField.returnKeyType = UIReturnKeySearch;
     [backView addSubview:self.inputField];
-    
     //扫描二维码
     UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
     button.frame = CGRectMake(backView.frame.size.width+backView.frame.origin.x+15, (NavigationHeight-20)/2, 25, 20);
     [button setBackgroundImage:TCImage(@"圆角矩形-3") forState:UIControlStateNormal];
     [button addTarget:self action:@selector(qrCodeButtonClickAction) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:button];
-    
     //按钮
     NSString *realName = [[Shoppersmanager manager].shoppers.employee.realName length]?[Shoppersmanager manager].shoppers.employee.realName:@"服务导购";
     NSArray *titleArray = [NSArray arrayWithObjects:@"功能菜单",@"消息",@"公告",realName,@"我的客户",@"购物袋", nil];
     //图片
     NSArray *imageArray = [NSArray arrayWithObjects:@"dial",@"message",@"tips",@"矢量智能对象-1",@"data",@"ablum", nil];
     for (int i=1; i<titleArray.count+1; i++) {
-        
         CustomButton *button = [CustomButton buttonWithType:UIButtonTypeCustom];
         button.frame = CGRectMake(ScreenWidth-(i*ButtonWIDTH + Buttoninterval*(i-1)), 10, ButtonWIDTH, ButtonRIGHT);
         [button setTitleColor:kMainBlueColor forState:UIControlStateNormal];
@@ -137,7 +128,8 @@
 {
     CustomButton *button = (CustomButton *)[self viewWithTag:105];
     NSInteger number = [object.object integerValue];
-    button.instructionsNumber = number;
+    [button showBadgeWithStyle:WBadgeStyleNumber value:number animationType:WBadgeAnimTypeShake];
+    [Shoppersmanager manager].shoppers.hasNotReadNotice -= number;
 }
 
 #pragma mark - 未读公告
@@ -145,8 +137,10 @@
 {
     CustomButton *button = (CustomButton *)[self viewWithTag:102];
     NSInteger number = [object.object integerValue];
-    button.instructionsNumber -= number;
-    [Shoppersmanager manager].shoppers.hasNotReadAffiche -= number;
+    NSInteger oldNumber = button.instructionsNumber;
+    oldNumber -= number;
+    [button showBadgeWithStyle:WBadgeStyleNumber value:oldNumber animationType:WBadgeAnimTypeScale];
+    [Shoppersmanager manager].shoppers.hasNotReadNotice -= number;
     [self setBadge];
 }
 
@@ -155,7 +149,9 @@
 {
     CustomButton *button = (CustomButton *)[self viewWithTag:101];
     NSInteger number = [object.object integerValue];
-    button.instructionsNumber -= number;
+    NSInteger oldNumber = button.instructionsNumber;
+    oldNumber -= number;
+    [button showBadgeWithStyle:WBadgeStyleNumber value:oldNumber animationType:WBadgeAnimTypeScale];
     [Shoppersmanager manager].shoppers.hasNotReadNotice -= number;
     [self setBadge];
 }

Lighting/Tools/CustomButton/CustomButton.h

@@ -19,6 +19,4 @@
 
 
 
-
-
 @end

Lighting/Tools/Parentclass/BaseViewController.m

@@ -441,7 +441,6 @@
 - (void)getStoreAddress:(void(^)())completed
 {
     [HTTP networkRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(STOREADDRESS),[Shoppersmanager manager].shoppers.employee.currentDepart.fid] withRequestType:POST withParameter:nil withReturnValueBlock:^(id returnValue) {
-        
         if (RESULT(returnValue)) {
             ToStoreAddress *address = [[ToStoreAddress alloc] initWithDictionary:RESPONSE(returnValue) error:nil];
             [Shoppersmanager manager].storeAddress = address;