1.适配图表

UU_Ent/Podfile

@@ -22,9 +22,7 @@ target 'UU_Ent' do
     pod 'FSCalendar'
     pod 'Charts'
     
-    
-    # ReactNative
-    
+    #ReactNative
     pod 'React', :path => './UU_RN/node_modules/react-native', :subspecs => [
     'Core',
     'CxxBridge',

UU_Ent/UU_Ent.xcodeproj/project.pbxproj

@@ -57,7 +57,6 @@
 		999F651A227E697D00329012 /* UILabel+vertical.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F6519227E697D00329012 /* UILabel+vertical.m */; };
 		999F651E227E6A6000329012 /* NSString+regular.m in Sources */ = {isa = PBXBuildFile; fileRef = 999F651D227E6A6000329012 /* NSString+regular.m */; };
 		99A05F6323322385007832D8 /* LunarFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A05F6223322385007832D8 /* LunarFormatter.m */; };
-		99AD4908233B077500AE0615 /* YRRnVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99AD4907233B077500AE0615 /* YRRnVC.m */; };
 		99B06C7022CDA18700D21A36 /* YRDocuVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B06C6F22CDA18700D21A36 /* YRDocuVC.m */; };
 		99B06C7322CDA1A800D21A36 /* YRDocuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B06C7222CDA1A800D21A36 /* YRDocuModel.m */; };
 		99B06C7622CDA1BE00D21A36 /* YRDocuCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B06C7522CDA1BE00D21A36 /* YRDocuCell.m */; };
@@ -286,8 +285,6 @@
 		999F651D227E6A6000329012 /* NSString+regular.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+regular.m"; sourceTree = "<group>"; };
 		99A05F6123322385007832D8 /* LunarFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LunarFormatter.h; sourceTree = "<group>"; };
 		99A05F6223322385007832D8 /* LunarFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LunarFormatter.m; sourceTree = "<group>"; };
-		99AD4906233B077500AE0615 /* YRRnVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRRnVC.h; sourceTree = "<group>"; };
-		99AD4907233B077500AE0615 /* YRRnVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRRnVC.m; sourceTree = "<group>"; };
 		99B06C6E22CDA18700D21A36 /* YRDocuVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRDocuVC.h; sourceTree = "<group>"; };
 		99B06C6F22CDA18700D21A36 /* YRDocuVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRDocuVC.m; sourceTree = "<group>"; };
 		99B06C7122CDA1A800D21A36 /* YRDocuModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRDocuModel.h; sourceTree = "<group>"; };
@@ -819,15 +816,6 @@
 			path = LunarFormatter;
 			sourceTree = "<group>";
 		};
-		99AD4905233B074400AE0615 /* RN */ = {
-			isa = PBXGroup;
-			children = (
-				99AD4906233B077500AE0615 /* YRRnVC.h */,
-				99AD4907233B077500AE0615 /* YRRnVC.m */,
-			);
-			path = RN;
-			sourceTree = "<group>";
-		};
 		99B06C6922CDA12900D21A36 /* Docu */ = {
 			isa = PBXGroup;
 			children = (
@@ -937,7 +925,6 @@
 		99C6FE7B22768EC000C7070A /* Modules */ = {
 			isa = PBXGroup;
 			children = (
-				99AD4905233B074400AE0615 /* RN */,
 				993F843E2330691A00E01145 /* Home */,
 				99F4A7352277CFDD009AA6ED /* Loading */,
 				99C6FE8522768EC000C7070A /* Base */,
@@ -1922,7 +1909,6 @@
 				999F651A227E697D00329012 /* UILabel+vertical.m in Sources */,
 				9948171722785013007C7CEA /* YRWorkTabCell.m in Sources */,
 				991C146C2282D8600080B54A /* GTMBase64.m in Sources */,
-				99AD4908233B077500AE0615 /* YRRnVC.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

UU_Ent/UU_Ent/Modules/Home/Charts/Controllers/YRAllChartVC.m

@@ -122,5 +122,4 @@
     return _chartView;
 }
 
-
 @end

UU_Ent/UU_Ent/Modules/Home/Main/Controllers/YRHomeVC.m

@@ -7,6 +7,7 @@
 //
 
 #import "YRHomeVC.h"
+#import "YRWebVC.h"
 #import "YRAllChartVC.h"
 #import "UINavigationController+alpha.h"
 #import "YRHomeHeader.h"
@@ -36,6 +37,37 @@
 
 @implementation YRHomeVC
 
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        
+        [self regesterNotification];
+        
+    }
+    return self;
+}
+
+#pragma mark -- 注册通知
+
+-(void)regesterNotification{
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(shouldShowAdview) name:@"YRLoadAdViewHadBeenClicked" object:nil];
+    
+}
+
+-(void)shouldShowAdview{
+    
+    YRWebVC *webVC = [YRWebVC new];
+    
+    webVC.navigationController.navigationBar.subviews[0].alpha = 1;
+    
+    webVC.url = @"https://sso.ubtob.com/register/enterpriseRegistration?inviteUserUU=1000001353&inviteSpaceUU=10050002&invitationTime=20190426";
+    
+    [self.navigationController pushViewController:webVC animated:YES];
+    
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -242,7 +274,6 @@
         YRHomeScheFooter *footer = [YRHomeScheFooter new];
         
         @weakify(self)
-        
         footer.showMore = ^{
           @strongify(self)
             
@@ -281,7 +312,7 @@
         footer.addClick = ^{
             @strongify(self)
             
-            CGRect rect = [self.tableView rectForSection:1];
+            CGRect rect = [self.tableView rectForSection:section];
             
             YRHomeScheAddView *addView = [[YRHomeScheAddView alloc]initWithFrame:rect];
             //新增日程
@@ -429,6 +460,8 @@
     //切换账套
     [[NSNotificationCenter defaultCenter] removeObserver:self name:kYRUserMasterChangedNotification object:nil];
     
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"YRLoadAdViewHadBeenClicked" object:nil];
+    
 }
 
 @end

UU_Ent/UU_Ent/Modules/Home/Main/Views/YRHeaderAppView.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface YRHeaderAppView : UIView
 
+
 @end
 
 NS_ASSUME_NONNULL_END

UU_Ent/UU_Ent/Modules/Home/Main/Views/YRHeaderAppView.m

@@ -73,7 +73,6 @@
 
 -(NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
     
-    
     return self.dataArr.count;
     
 }
@@ -82,7 +81,6 @@
 
 -(__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
     
-    
     YRHeaderAppCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"YRHeaderAppCellReid" forIndexPath:indexPath];
     
     cell.model = self.dataArr[indexPath.row];

UU_Ent/UU_Ent/Modules/Home/Main/Views/YRHomeFooter.m

@@ -37,7 +37,6 @@
         
     }];
     
-    
     UILabel *bottomLabel = [UILabel new];
     
     [self addSubview:bottomLabel];
@@ -47,7 +46,7 @@
     bottomLabel.textColor = HexColor(@"#CCCCCC");
     
     [bottomLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-       
+        
         make.centerX.equalTo(self);
         make.bottom.equalTo(self).offset(-40);
         make.width.mas_greaterThanOrEqualTo(@60);

UU_Ent/UU_Ent/Modules/Home/Main/Views/YRHomeHeader.h

@@ -12,7 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface YRHomeHeader : UIView
 
-
 @end
 
 NS_ASSUME_NONNULL_END

UU_Ent/UU_Ent/Modules/Message/Main/Controllers/YRMsgVC.m

@@ -198,22 +198,11 @@
 #pragma mark - 通知
 -(void)regesterNotification{
     
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(shouldShowAdview) name:@"YRLoadAdViewHadBeenClicked" object:nil];
-    
     //切换账套
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(loadData) name:kYRUserMasterChangedNotification object:nil];
     
 }
 
--(void)shouldShowAdview{
-    
-    YRWebVC *webVC = [YRWebVC new];
-    
-    webVC.url = @"https://sso.ubtob.com/register/enterpriseRegistration?inviteUserUU=1000001353&inviteSpaceUU=10050002&invitationTime=20190426";
-    
-    [self.navigationController pushViewController:webVC animated:YES];
-    
-}
 
 #pragma mark - 网络请求
 

UU_Ent/UU_Ent/Modules/Web/Main/YRWebVC.m

@@ -25,6 +25,14 @@
     
 }
 
+-(void)viewDidAppear:(BOOL)animated{
+    
+    [super viewDidAppear:animated];
+    
+    self.navigationController.navigationBar.subviews[0].alpha = 1;
+    
+    
+}
 
 -(void)createUI{
     

UU_Ent/UU_Ent/Supporting Files/Bridging/YRBridging.swift

@@ -10,6 +10,4 @@ import UIKit
 
 class YRBridging: NSObject {
 
-    
-    
 }

UU_Ent/UU_Ent/Utils/Network/YRNetworkManager.h

@@ -74,5 +74,4 @@ typedef NS_ENUM(NSInteger,requestType) {
 
 @end
 
-
 NS_ASSUME_NONNULL_END

UU_Ent/UU_Ent/Utils/Network/YRNetworkManager.m

@@ -32,13 +32,13 @@
     instance.manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript",@"text/html",@"text/plain",@"charset=UTF-8", nil];
     
     /*由于有三种接口：B2B,ERP,IM，所以这两句需要的在外面自定义*/
-    //    manager.requestSerializer = [AFJSONRequestSerializer serializer];
-    //    manager.responseSerializer = [AFJSONResponseSerializer serializer];
+    //manager.requestSerializer = [AFJSONRequestSerializer serializer];
+    //manager.responseSerializer = [AFJSONResponseSerializer serializer];
     
     [instance.manager.securityPolicy setAllowInvalidCertificates:YES];
     [instance.manager.requestSerializer setValue:@"application/x-www-form-urlencoded;charset=utf8" forHTTPHeaderField:@"Content-Type"];
     
-//    [instance.manager.requestSerializer setValue:FORMAT(@"%@",g_sessionUser) forHTTPHeaderField:@"sessionUser"];
+    //[instance.manager.requestSerializer setValue:FORMAT(@"%@",g_sessionUser) forHTTPHeaderField:@"sessionUser"];
     
     [instance.manager.requestSerializer setValue:[NSString stringWithFormat:@"JSESSIONID=%@",[[NSUserDefaults standardUserDefaults] objectForKey:@"sessionId"]] forHTTPHeaderField:@"Cookie"];
     
@@ -63,10 +63,8 @@
     [manage setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
         if (status ==  AFNetworkReachabilityStatusNotReachable) {//没有网络的情况
             
-            
             [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"netWorkStatus"];
             
-            
         }else{
             
             [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"netWorkStatus"];

UU_Ent/UU_Ent/Utils/UIDevice/UIDevice+extension.m

@@ -16,7 +16,7 @@
     
     [[UIDevice currentDevice] setValue:resetOrientationTarget forKey:@"orientation"];
     
-    NSNumber *orientationTarget = [NSNumber numberWithInt:interfaceOrientation];
+    NSNumber *orientationTarget = [NSNumber numberWithInt:(int)interfaceOrientation];
     
     [[UIDevice currentDevice] setValue:orientationTarget forKey:@"orientation"];