time 6 жил өмнө
parent
commit
625f70f53f

+ 6 - 0
UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		999F651E227E6A6000329012 /* NSString+regular.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F651D227E6A6000329012 /* NSString+regular.m */; };
 		99C16340227FD24E002ED79D /* YRWorkConModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C1633F227FD24E002ED79D /* YRWorkConModel.m */; };
 		99C16342227FDE64002ED79D /* work_route.json in Resources */ = {isa = PBXBuildFile; fileRef = 99C16341227FDE64002ED79D /* work_route.json */; };
+		99C16345228027C8002ED79D /* YRMsgHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C16344228027C8002ED79D /* YRMsgHeader.m */; };
 		99C6FE6122768B5C00C7070A /* UU_EntTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE6022768B5C00C7070A /* UU_EntTests.m */; };
 		99C6FE6C22768B5C00C7070A /* UU_EntUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE6B22768B5C00C7070A /* UU_EntUITests.m */; };
 		99C6FE8F22768EC000C7070A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 99C6FE7E22768EC000C7070A /* AppDelegate.m */; };
@@ -163,6 +164,8 @@
 		99C1633E227FD24E002ED79D /* YRWorkConModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRWorkConModel.h; sourceTree = "<group>"; };
 		99C1633F227FD24E002ED79D /* YRWorkConModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRWorkConModel.m; sourceTree = "<group>"; };
 		99C16341227FDE64002ED79D /* work_route.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = work_route.json; sourceTree = "<group>"; };
+		99C16343228027C8002ED79D /* YRMsgHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRMsgHeader.h; sourceTree = "<group>"; };
+		99C16344228027C8002ED79D /* YRMsgHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRMsgHeader.m; sourceTree = "<group>"; };
 		99C6FE4422768B5B00C7070A /* UU_Ent.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UU_Ent.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		99C6FE5C22768B5C00C7070A /* UU_EntTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UU_EntTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		99C6FE6022768B5C00C7070A /* UU_EntTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UU_EntTests.m; sourceTree = "<group>"; };
@@ -765,6 +768,8 @@
 			children = (
 				99C6FF212276E4C000C7070A /* YRMsgMainCell.h */,
 				99C6FF222276E4C000C7070A /* YRMsgMainCell.m */,
+				99C16343228027C8002ED79D /* YRMsgHeader.h */,
+				99C16344228027C8002ED79D /* YRMsgHeader.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -1276,6 +1281,7 @@
 				99C6FED12276982F00C7070A /* YRTabBar.m in Sources */,
 				27029BD0227709CC00D53A94 /* UIButton+Layout.m in Sources */,
 				99C6FF232276E4C000C7070A /* YRMsgMainCell.m in Sources */,
+				99C16345228027C8002ED79D /* YRMsgHeader.m in Sources */,
 				99C6FECB227696CA00C7070A /* YRMsgVC.m in Sources */,
 				99C16340227FD24E002ED79D /* YRWorkConModel.m in Sources */,
 				99C6FF262276FAE000C7070A /* YRMsgMainModel.m in Sources */,

+ 33 - 0
UU_Ent/UU_Ent/Modules/Base/YRBaseNav.m

@@ -18,8 +18,40 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+    [self present];
+    
+    
+}
+
+-(void)setNavigationBar{
+    
     self.navigationBar.tintColor = [UIColor orangeColor];
     
+    
+}
+
+-(void)present{
+    
+    if (self.presentedViewController) {
+        
+        UIBarButtonItem *leftItem = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(backAction)];
+        
+        leftItem.tintColor = [UIColor whiteColor];
+        
+        self.navigationItem.leftBarButtonItems = @[leftItem];
+        
+    }
+    
+}
+
+-(void)backAction{
+    
+    if (self.presentedViewController) {
+        
+        [self dismissViewControllerAnimated:YES completion:nil];
+        
+    }
+    
 }
 
 
@@ -44,4 +76,5 @@
 
 
 
+
 @end

+ 9 - 1
UU_Ent/UU_Ent/Modules/Main/Main/Views/YRTabBar.h

@@ -14,9 +14,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(assign,nonatomic)NSInteger remindCount;
 
+/**
+ 显示红点提示
+
+ */
 - (void)showBadgeOnItemIndex:(int)index;
 
-- (void)hideBadgeOnItemIndex:(int)index; 
+/**
+ 隐藏红点
+
+ */
+- (void)hideBadgeOnItemIndex:(int)index;
 
 @end
 

+ 0 - 1
UU_Ent/UU_Ent/Modules/Message/Main/Models/YRMsgMainModel.m

@@ -27,7 +27,6 @@
     
     NSArray *routeArr = routeDic[@"data"];
     
-        
         for (NSDictionary *dic in routeArr) {
             
             if ([_code isEqualToString:dic[@"code"]]) {

+ 17 - 0
UU_Ent/UU_Ent/Modules/Message/Main/Views/YRMsgHeader.h

@@ -0,0 +1,17 @@
+//
+//  YRMsgHeader.h
+//  UU_Ent
+//
+//  Created by liujl on 2019/5/6.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface YRMsgHeader : UIView
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 30 - 0
UU_Ent/UU_Ent/Modules/Message/Main/Views/YRMsgHeader.m

@@ -0,0 +1,30 @@
+//
+//  YRMsgHeader.m
+//  UU_Ent
+//
+//  Created by liujl on 2019/5/6.
+//  Copyright © 2019 UAS. All rights reserved.
+//
+
+#import "YRMsgHeader.h"
+
+@implementation YRMsgHeader
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        
+        [self setUpUI];
+        
+    }
+    return self;
+}
+
+-(void)setUpUI{
+    
+    
+    
+}
+
+@end