1.OA表单MF类型

2.未读下标重新设计

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -1446,6 +1446,9 @@
 		9961DAD021956846007CA402 /* UASScheHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DACF21956846007CA402 /* UASScheHeader.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9961DAD32195687D007CA402 /* UASScheModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DAD22195687D007CA402 /* UASScheModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		9961DAD6219568D4007CA402 /* UASScheduleMainCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9961DAD5219568D4007CA402 /* UASScheduleMainCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		9997D58C22F187E0005292B7 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 9997D58922F187E0005292B7 /* main.jsbundle */; };
+		9997D58D22F187E0005292B7 /* app.json in Resources */ = {isa = PBXBuildFile; fileRef = 9997D58B22F187E0005292B7 /* app.json */; };
+		9997D58F22F190AA005292B7 /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 9997D58E22F190AA005292B7 /* logo.png */; };
 		99984659212D1124006FDD60 /* UASScheduleReVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99984658212D1124006FDD60 /* UASScheduleReVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99A2B88621571916002C8A97 /* UASClientVisitPlanCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A2B88521571916002C8A97 /* UASClientVisitPlanCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99A6655B21192EA5007A858D /* UASPreView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99A6655A21192EA5007A858D /* UASPreView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -5097,6 +5100,9 @@
 		9961DAD22195687D007CA402 /* UASScheModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheModel.m; sourceTree = "<group>"; };
 		9961DAD4219568D4007CA402 /* UASScheduleMainCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleMainCell.h; sourceTree = "<group>"; };
 		9961DAD5219568D4007CA402 /* UASScheduleMainCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheduleMainCell.m; sourceTree = "<group>"; };
+		9997D58922F187E0005292B7 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
+		9997D58B22F187E0005292B7 /* app.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = app.json; sourceTree = "<group>"; };
+		9997D58E22F190AA005292B7 /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
 		99984657212D1124006FDD60 /* UASScheduleReVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleReVC.h; sourceTree = "<group>"; };
 		99984658212D1124006FDD60 /* UASScheduleReVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheduleReVC.m; sourceTree = "<group>"; };
 		99A2B88421571916002C8A97 /* UASClientVisitPlanCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientVisitPlanCell.h; sourceTree = "<group>"; };
@@ -12033,6 +12039,24 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		9997D58822F187E0005292B7 /* bundle */ = {
+			isa = PBXGroup;
+			children = (
+				9997D58922F187E0005292B7 /* main.jsbundle */,
+				9997D58A22F187E0005292B7 /* assets */,
+			);
+			path = bundle;
+			sourceTree = "<group>";
+		};
+		9997D58A22F187E0005292B7 /* assets */ = {
+			isa = PBXGroup;
+			children = (
+				9997D58B22F187E0005292B7 /* app.json */,
+				9997D58E22F190AA005292B7 /* logo.png */,
+			);
+			path = assets;
+			sourceTree = "<group>";
+		};
 		99B02ADC22EED6650014A144 /* RN */ = {
 			isa = PBXGroup;
 			children = (
@@ -12047,6 +12071,7 @@
 		99B02ADD22EED6650014A144 /* Others */ = {
 			isa = PBXGroup;
 			children = (
+				9997D58822F187E0005292B7 /* bundle */,
 			);
 			path = Others;
 			sourceTree = "<group>";
@@ -17548,6 +17573,7 @@
 				CC30175C1951BABF0059BADA /* f095.png in Resources */,
 				2732E7EC1D1A248900B2789F /* uu_crm_round.png in Resources */,
 				CC6E182319794BC7006ADA8A /* RegistrationHighlight@2x.png in Resources */,
+				9997D58C22F187E0005292B7 /* main.jsbundle in Resources */,
 				CC6E186F19794BC7006ADA8A /* pub_record_button@2x.png in Resources */,
 				CCE2415018FFB8EB00A3CB5A /* recorder_trash_can2.png in Resources */,
 				20EA4C4220AD34960055577D /* loadingAd46.png in Resources */,
@@ -17852,6 +17878,7 @@
 				20EA4C2E20AD34960055577D /* loadingAd59.png in Resources */,
 				AA3703711E5AF6E0001F3EAA /* uu_voice_search8.png in Resources */,
 				CC6E17D719794BC7006ADA8A /* im_003_more_button_normal@2x.png in Resources */,
+				9997D58F22F190AA005292B7 /* logo.png in Resources */,
 				7D26699B1E5FC5DD00F16C15 /* btn_shensu_nor2.png in Resources */,
 				7D86CEC61DDC27AF003805D1 /* oa_daka_line111.png in Resources */,
 				B8793A061D645930006AAFC9 /* searchbar_textfield_search_icon@2x.png in Resources */,
@@ -18534,6 +18561,7 @@
 				20EA4C3C20AD34960055577D /* loadingAd51.png in Resources */,
 				CC3A1427195851280054127B /* v_cammer@2x.png in Resources */,
 				CCE2415118FFB8EB00A3CB5A /* recorder_trash_can2@2x.png in Resources */,
+				9997D58D22F187E0005292B7 /* app.json in Resources */,
 				CC6E186119794BC7006ADA8A /* feeds_play_btn@2x.png in Resources */,
 				7D736AE81E0BE3DE0035B25B /* icon_banci_nor3.png in Resources */,
 				272F120A1CC4D95100452A0D /* uu_work_chaxun_press.png in Resources */,
@@ -20097,6 +20125,8 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODEPUSH_KEY = vZXYx0je0ztieMJOKneqszC1iEfj4ksvOXqog;
+				CODEPUSH_URL = "http://118.31.228.154:3000/";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
@@ -20141,6 +20171,8 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODEPUSH_KEY = gNVbisvWP6wzi4CKPMeFyiAg1bJI4ksvOXqog;
+				CODEPUSH_URL = "http://118.31.228.154:3000/";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;

shiku_im/shiku_im/AppDelegate.mm

@@ -58,6 +58,7 @@
 #import "UASWorkManager.h"
 #import "NSString+secri.h"
 #import <MapKit/MapKit.h>
+#import <React/RCTDevLoadingView.h>
 //#import "UICKeyChainStore.h"
 #undef TAG
 #define kTAG @"AppDelegate///: "
@@ -324,8 +325,11 @@
     
     if([[NSUserDefaults standardUserDefaults] boolForKey:isAutoLoginOrNot]){
         
-        self.tabMain = [[UASMainVC alloc]init];
-        
+        if (self.tabMain == nil) {
+            
+         self.tabMain = [[UASMainVC alloc]init];
+            
+        }
         
     }
     
@@ -365,13 +369,6 @@
     self.adView = [[UASAdView startLoad] autorelease];
     @weakify(self)
     self.adView.loadCompleted = ^{
-
-        UIViewController *RN = [NSClassFromString(@"YRReactVC") new];
-        
-        self.window.rootViewController = RN;
-        
-        return;
-        
         @strongify(self)
         
         NSString *lastVersion = [[NSUserDefaults standardUserDefaults] objectForKey:@"theLastVersion"];
@@ -497,10 +494,17 @@
         
     });
     
+    [self reactNativeConfig];
+    
+}
+
+-(void)reactNativeConfig{
     
+    [RCTDevLoadingView setEnabled:NO];
     
 }
 
+
 /**
  启动日志
  */
@@ -5681,22 +5685,19 @@
     NSString *currentVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
     if ([lastVersion isEqualToString:currentVersion]) {//版本号相同
         if ([[NSUserDefaults standardUserDefaults] boolForKey:isAutoLoginOrNot]) {//自动登录
-            
+        
             [self showMainUI];
-            
-//            [jxServer getSetting:self];
-            
-           
+
         }else{//手动登录
-            
+
             [self showLoginUI];
-            
-                        
+
+
         }
     }else{//版本号不同
         
        UASGuideController *guideVc = [[[UASGuideController alloc]init] autorelease];
-       
+        
         @weakify(self)
         guideVc.chooseNextVC = ^{
             @strongify(self)
@@ -5822,13 +5823,12 @@
     [g_server newlogout:[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_ID] offlineTime:str1 toView:nil];
     
     NSString * times=[NSString getLongCurrenTime];
-    NSDictionary *dic =    [NSDictionary dictionaryWithObjectsAndKeys:
+    NSDictionary *dic  =    [NSDictionary dictionaryWithObjectsAndKeys:
                             times,@"aa_date",
                             @"iOSAPP在线",@"aa_type",
                             @"APP杀死",@"aa_remark",
                             [[NSUserDefaults standardUserDefaults] objectForKey:@"UUCurrentAddress"],@"aa_location",
                             [[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_LoginName],@"aa_telephone",
-                            
                             nil];
      [[NSNotificationCenter defaultCenter] postNotificationName:@"saveMonitorLogALLL" object:@"monitorLog" userInfo:dic];
     

shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -9,6 +9,12 @@
 #import <React/RCTRootView.h>
 #import <React/RCTBundleURLProvider.h>
 
+
+//url:http://118.31.228.154:3000/
+
+// Production  gNVbisvWP6wzi4CKPMeFyiAg1bJI4ksvOXqog
+// Staging     vZXYx0je0ztieMJOKneqszC1iEfj4ksvOXqog
+
 @interface YRReactVC ()
 
 @end
@@ -18,14 +24,13 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-
     
-
     NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-
+    
     RCTRootView * rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"UU_RN"
                                                           initialProperties:@{@"UU":@"UU_RN"}
                                                               launchOptions:nil];
+
     
     self.view = rootView;
     

shiku_im/shiku_im/RN/Others/bundle/assets/app.json

@@ -0,0 +1,4 @@
+{
+  "name": "UU_RN",
+  "displayName": "UU_RN"
+}

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -845,7 +845,34 @@
         } failure:^(NSURLSessionDataTask *task, NSError *error) {
             //请求失败
             [UASUserInfo shareManager].b2bDic = @{};
+            [_wait stop];
             [[NSUserDefaults standardUserDefaults] setObject:@{} forKey:@"B2BplatformData"];
+            NSData *returnData = [[error userInfo]                     objectForKey:@"com.alamofire.serialization.response.error.data"];
+        
+            NSString *errorStr  = @"网络异常";
+            
+            if (returnData) {
+                
+                NSString *errorStr1  = @"";
+                
+                id content = [NSJSONSerialization JSONObjectWithData:returnData options:NSJSONReadingMutableContainers error:nil];
+                
+                errorStr = [NSString stringWithFormat:@"%@",[content objectForKey:@"exceptionInfo"]];
+                errorStr1 = [NSString stringWithFormat:@"%@",[content objectForKey:@"message"]];
+                if ([errorStr isEqualToString:@"(null)"] || errorStr.length==0) {
+                    
+                    if ([errorStr1 isEqualToString:@"(null)"] || errorStr1.length==0) {
+                        errorStr = [[ NSString alloc] initWithData:returnData encoding:NSUTF8StringEncoding];
+                        
+                        
+                    }
+        
+                }
+                
+                
+            }
+            
+            [KPromptBox showKPromptBoxWithMassage:errorStr];
     
         }];
     }

shiku_im/shiku_im/bundle/assets/app.json

@@ -0,0 +1,4 @@
+{
+  "name": "UU_RN",
+  "displayName": "UU_RN"
+}

shiku_im/shiku_im/controller/DocumentVC.m

@@ -2720,6 +2720,8 @@ static NSString *cellID = @"cellID";
         
         dataVC.type = typeStr;
         
+        dataVC.selectedStr = textView.text;
+        
         dataVC.block = ^(NSArray *backData,NSString *showKey,NSMutableArray *dgField){
             for (int a = 0; a < dgField.count; a++) {
                 int c , d ;
@@ -2741,33 +2743,34 @@ static NSString *cellID = @"cellID";
                                     valueStr = [valueStr stringByAppendingString:@"#"];
                                 }
                             }
+                            //改变保存的数组
+                            NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
+                            NSMutableArray *sArray = [[NSMutableArray alloc]init];
+                            NSArray *abc;
+                            abc = [_detailDataArr mutableCopy];
+                            for (int i = 0; i < abc.count; i++) {
+                                
+                                sArray = abc[i];
+                                if (i == c) {
+                                    [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
+                                }
+                                
+                                [backTitleArray addObject:sArray];
+                                
+                            }
+                            _detailDataArr = backTitleArray;
+                            
+                            //改变对应textView不能编辑
+                            int index = c*1000 + d;
+                            for (DocumentCell *cell in _tableView.visibleCells) {
+                                if (cell.MyTextView.tag == index) {
+                                    cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
+                                }
+                            }
                         }
                     }
                 }
-                //改变保存的数组
-                NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
-                NSMutableArray *sArray = [[NSMutableArray alloc]init];
-                NSArray *abc;
-                abc = [_detailDataArr mutableCopy];
-                for (int i = 0; i < abc.count; i++) {
-                    
-                    sArray = abc[i];
-                    if (i == c) {
-                        [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
-                    }
-                    
-                    [backTitleArray addObject:sArray];
-                    
-                }
-                _detailDataArr = backTitleArray;
                 
-                //改变对应textView不能编辑
-                int index = c*1000 + d;
-                for (DocumentCell *cell in _tableView.visibleCells) {
-                    if (cell.MyTextView.tag == index) {
-                        cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
-                    }
-                }
                 
             }
             

shiku_im/shiku_im/controller/MFselectVC.m

@@ -143,10 +143,22 @@ static NSString *cellID = @"cellID";
         
         NSString *dataStr = responseObject[@"data"];
         NSDictionary *dataDic = [self dictionaryWithJsonString:dataStr];
+        NSArray *selectArr = [self.selectedStr componentsSeparatedByString:@"#"];
         for (id obj in dataDic) {
             [_dataArr addObject:obj];
             [_allDataArr addObject:obj];
             [_searchArr addObject:[obj objectForKey:_showKey]];
+            
+            for (NSString *seleStr in selectArr) {
+                
+                if ([[NSString stringWithFormat:@"%@",obj[_showKey]] isEqualToString:seleStr]) {
+                    
+                    [self.SelectedArr addObject:obj];
+                    
+                }
+                
+            }
+            
         }
         
         [_tableView reloadData];

shiku_im/shiku_im/controller/UASMainVC.m

@@ -23,6 +23,7 @@
 #import "UASScheDisMissAni.h"
 #import "ScheduleListModel.h"
 #import "ScheduleRemindVC.h"
+
 @interface UASMainVC ()<UIAlertViewDelegate,UITabBarDelegate,UITabBarControllerDelegate,UIViewControllerTransitioningDelegate>
 
 @property(strong,nonatomic)NSMutableArray<UIView *> *tarArr;
@@ -73,10 +74,8 @@
     [self subVCWith:addVc title:Localized(@"UU_TabBarLabel1") normalImgTitle:@"UU_TabContact_nor" selImgTitle:@"UU_TabContact_select"];
     [self subVCWith:workVc title:Localized(@"UU_TabBarLabel2") normalImgTitle:@"UU_TabWork_nor" selImgTitle:@"UU_TabWork_select"];
     [self subVCWith:woVc title:Localized(@"UU_TabBarLabel3") normalImgTitle:@"UU_TabMe_nor" selImgTitle:@"UU_TabMe_select"];
-    [tarBar showBadgeOnItemIndex:0];
     [self checkVersion];
     [self postBPushDataToServer:[BPush getChannelId]];
-    [self createUI];
     [self scheduleRemindView];
     self.tabBar.tintColor = HexColor(@"#1084D1");
     SLog(@"百度推送ID:%@",[BPush getChannelId]);
@@ -150,7 +149,10 @@
 }
 
 
--(void)createUI{
+
+-(void)viewDidAppear:(BOOL)animated{
+    
+    [super viewDidAppear:animated];
     
     UASTabbar *tarbar = (UASTabbar *)self.tabBar;
     
@@ -164,9 +166,9 @@
         }
         
     }
-
-
+    
 }
+
 -(void)addNotification{
     
     //注册设置界面是否需要引导的通知

shiku_im/shiku_im/controller/UASTabbar.m

@@ -12,118 +12,143 @@
 
 @interface UASTabbar()
 
-@property(strong,nonatomic)UASButton *badgeBtn;
-    
+@property(strong,nonatomic)NSMutableArray<UILabel *> *labArr;
+
+@property(assign,atomic)BOOL isExist;
 
 @end
 
 @implementation UASTabbar
 
--(void)setRemindCount:(NSInteger)remindCount{
+
+-(void)layoutSubviews{
     
+    [super layoutSubviews];
     
-    if (remindCount>0) {
-
-        self.badgeBtn.hidden = NO;
-        if (remindCount > 99) {
+    [self addRemindView];
     
-            self.badgeBtn.titleLabel.font = [UIFont systemFontOfSize:8]; //消息大小不变
-            
-            [self.badgeBtn setTitle:@"99+" forState:UIControlStateNormal];
-            
+}
 
-        }else{
-        
-             self.badgeBtn.titleLabel.font = [UIFont systemFontOfSize:8]; //消息大小不变
+-(void)addRemindView{
+    
+    if (self.isExist  || self.labArr.count>0) return;
+    self.isExist = YES;
+    
+    NSInteger index = 0;
+    
+    for (UIView *view in self.subviews) {
+        if ([view isKindOfClass:NSClassFromString(@"UITabBarButton")]) {
             
-             [self.badgeBtn setTitle:[NSString stringWithFormat:@"%ld",(long)remindCount] forState:UIControlStateNormal];
+            for (UIView *viewOne in view.subviews) {
+                
+                if ([viewOne isKindOfClass:NSClassFromString(@"UITabBarSwappableImageView")]) {
+                    
+                    UILabel *label = [UILabel new];
+                    label.backgroundColor = [UIColor redColor];
+                    if (index == 0) {
+                        
+                        label.layer.cornerRadius = 8;
+                        label.layer.masksToBounds = YES;
+                        
+                        label.textColor = [UIColor whiteColor];
+                        
+                        label.font = [UIFont systemFontOfSize:8];
+                        
+                        label.textAlignment = NSTextAlignmentCenter;
+                        
+                        [viewOne addSubview:label];
+                        
+                        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+                            
+                            make.top.equalTo(viewOne).offset(-6);
+                            make.right.equalTo(viewOne).offset(10);
+                            make.width.height.mas_equalTo(16);
+                            
+                        }];
+                        
+                    }else{
+                        
+                        label.layer.cornerRadius = 5;
+                        label.layer.masksToBounds = YES;
+                        
+                        [viewOne addSubview:label];
+                        
+                        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+                            
+                            make.top.equalTo(viewOne).offset(-5);
+                            make.right.equalTo(viewOne).offset(5);
+                            make.width.height.mas_equalTo(10);
+                            
+                        }];
+                        
+                    }
+                    index++;
+                    label.hidden = YES;
+                    [self.labArr addObject:label];
+                }
+                
+            }
             
         }
         
         
-        
-    }else{
-       
-        self.badgeBtn.hidden = YES;
-    
     }
+    
+}
 
+- (void)showBadgeOnItemIndex:(int)index{
+    
+    if (self.labArr.count == 0 || index >= self.items.count) return;
+    
+    self.labArr[index].hidden = NO;
+    
 }
 
+- (void)hideBadgeOnItemIndex:(int)index{
+    
+    if (self.labArr.count == 0 || index >= self.items.count) return;
 
+    self.labArr[index].hidden = YES;
+    
+}
 
-- (void)showBadgeOnItemIndex:(int)index{
 
+-(void)setRemindCount:(NSInteger)remindCount{
     
-    if (index > 0) {
-        [self removeBadgeOnItemIndex:index];
-        
-        UIView *badgeView = [[UIView alloc]init];
-        badgeView.tag = 9999 + index;
-        badgeView.layer.cornerRadius = 5;
-        badgeView.backgroundColor = [UIColor redColor];
-        CGRect tabFrame = self.frame;
-        
-        float percentX = (index +0.6) / TabbarItemNums;
-        CGFloat x = ceilf(percentX * tabFrame.size.width);
-        CGFloat y = ceilf(0.1 * tabFrame.size.height);
-        badgeView.frame = CGRectMake(x, y, 10, 10);
-        [self addSubview:badgeView];
-        
-    }else{
-        
-        CGFloat bageWidth = 16;
-        UASButton *badgeBtn = [UASButton new];
-        badgeBtn.layer.cornerRadius = bageWidth/2;
-        badgeBtn.backgroundColor = [UIColor redColor];
-        CGRect tabFrame = self.frame;
+    _remindCount = remindCount;
+    
+    if (remindCount > 0) {
         
-        float percent = 0;
+        self.labArr[0].hidden = NO;
         
-        if (SCREEN_WIDTH > 320) {
+        if (remindCount > 99) {
             
-            percent = 0.595;
+            self.labArr[0].font = [UIFont systemFontOfSize:7];
+            self.labArr[0].text = @"99+";
             
         }else{
             
-            percent = 0.625;
-            
+            self.labArr[0].font = [UIFont systemFontOfSize:8];
+            self.labArr[0].text = [NSString stringWithFormat:@"%ld",(long)remindCount];
         }
         
-        float percentX = (index + percent) / TabbarItemNums;
-        CGFloat x = ceilf(percentX * tabFrame.size.width);
-        CGFloat y = ceilf(0.08 * tabFrame.size.height);
-        badgeBtn.frame = CGRectMake(x, y,bageWidth, bageWidth);
-        [self bringSubviewToFront:badgeBtn];
-        self.badgeBtn.titleLabel.numberOfLines = 1;
-        self.badgeBtn = badgeBtn;
-        self.badgeBtn.titleLabel.font = FONT_SIZE(8);
-        self.badgeBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;
-        self.badgeBtn.hidden = YES;
-        [self addSubview:self.badgeBtn];
-
+    }else{
+        
+        self.labArr[0].hidden = YES;
+        
     }
-}
-
-- (void)hideBadgeOnItemIndex:(int)index{
     
-    [self removeBadgeOnItemIndex:index];
-}
-
-- (void)removeBadgeOnItemIndex:(int)index{
     
-    for (UIView *subView in self.subviews) {
-        if (subView.tag == 9999+index) {
-            [subView removeFromSuperview];
-        }
-    }
 }
 
--(void)layoutSubviews{
-    
-    [super layoutSubviews];
+-(NSMutableArray *)labArr{
     
+    if (!_labArr) {
+        
+        _labArr = [NSMutableArray new];
+        
+    }
     
+    return _labArr;
 }
-
 @end

shiku_im/shiku_im/controller/UpdateDocumentVC.m

@@ -2942,33 +2942,34 @@ static NSString *cellID = @"cellID";
                                     valueStr = [valueStr stringByAppendingString:@"#"];
                                 }
                             }
+                            //改变保存的数组
+                            NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
+                            NSMutableArray *sArray = [[NSMutableArray alloc]init];
+                            NSArray *abc;
+                            abc = [_detailDataArr mutableCopy];
+                            for (int i = 0; i < abc.count; i++) {
+                                
+                                sArray = abc[i];
+                                if (i == c) {
+                                    [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
+                                }
+                                
+                                [backTitleArray addObject:sArray];
+                                
+                            }
+                            _detailDataArr = backTitleArray;
+                            
+                            //改变对应textView不能编辑
+                            int index = c*1000 + d;
+                            for (DocumentCell *cell in _tableView.visibleCells) {
+                                if (cell.MyTextView.tag == index) {
+                                    cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
+                                }
+                            }
                         }
                     }
                 }
-                //改变保存的数组
-                NSMutableArray *backTitleArray = [[NSMutableArray alloc]init];
-                NSMutableArray *sArray = [[NSMutableArray alloc]init];
-                NSArray *abc;
-                abc = [_detailDataArr mutableCopy];
-                for (int i = 0; i < abc.count; i++) {
-                    
-                    sArray = abc[i];
-                    if (i == c) {
-                        [sArray replaceObjectAtIndex:d withObject:[NSString stringWithFormat:@"%@",valueStr]];
-                    }
-                    
-                    [backTitleArray addObject:sArray];
-                    
-                }
-                _detailDataArr = backTitleArray;
                 
-                //改变对应textView不能编辑
-                int index = c*1000 + d;
-                for (DocumentCell *cell in _tableView.visibleCells) {
-                    if (cell.MyTextView.tag == index) {
-                        cell.MyTextView.text = [NSString stringWithFormat:@"%@",valueStr];
-                    }
-                }
                 
             }
             

shiku_im/shiku_im/controller/myOA/JLPunchCardViewController.m

@@ -865,8 +865,7 @@
                     [_kaoqingArr addObject:model];
                 }
                 
-                
-                
+
             }
         }
         

shiku_im/shiku_im/controller/myOA/JOPunchCardViewController.m

@@ -1937,14 +1937,12 @@ updatingLocation:(BOOL)updatingLocation
     
     if (error == nil) {
         DLog(@"heiehi%@",ObjectData);
-   JLHeightSettingModel  * _model = [JLHeightSettingModel mj_objectWithKeyValues:ObjectData];
+        JLHeightSettingModel  * _model = [JLHeightSettingModel mj_objectWithKeyValues:ObjectData];
         
         JLAdvancedSettingVC *vc = [[JLAdvancedSettingVC alloc] init];
         vc.model = _model;
         [self.navigationController pushViewController:vc animated:YES];
         
-              
-        
     }else{
         if (error.code==-1009)
         {

shiku_im/shiku_im/controller/myOA/LYHTTPRequest.h

@@ -190,5 +190,4 @@ typedef NS_ENUM(NSInteger,RequestType)
 
 
 
-
 @end

shiku_im/shiku_im/shiku_im-Info.plist

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CodePushServerURL</key>
+	<string>$(CODEPUSH_URL)</string>
+	<key>CodePushDeploymentKey</key>
+	<string>$(CODEPUSH_KEY)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>

shiku_im/shiku_im/文件夹1/B2B商务（新）/Controllers/UASB2BMainVC.m

@@ -98,7 +98,6 @@
     
     label.userInteractionEnabled = YES;
     
-    
     label.target = self;
     
     label.aSelector = @selector(barViewDidclicked);
@@ -122,10 +121,8 @@
     
     label.height = 22;
     
-    
     label.attributedText = attrStr;
     
-    
     self.navigationItem.titleView = barView;
     
     barView.target = self;
@@ -138,7 +135,6 @@
     
     @weakify(self)
     LOGLoopView *header = [[LOGLoopView alloc]initWithUrls:loopArr titles:@[] didSelected:^(NSInteger index) {
-       
         @strongify(self)
         [self pushToAllControllerWithIndex:index];
         
@@ -157,7 +153,6 @@
     _tabelView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
         
         @strongify(self)
-        
         [self getAllDataFromServer];
         
         

shiku_im/shiku_im/文件夹1/WorkMain(工作新页面)/Controllers/UASWorkMainVC.m

@@ -458,12 +458,14 @@
     
     [self.navigationController pushViewController:setVC animated:YES];
     
-    
 }
 
 
 
 
+/**
+ 跳转日程界面
+ */
 -(void)moveToScheduleVC{
     
     UASMainVC *main = (UASMainVC *)self.tabBarController;

shiku_im/shiku_im/文件夹3/MainView/NewWoVC.m

@@ -355,6 +355,17 @@ static NSString *cellID = @"cellID";
     [_tableView reloadData];
 }
 
+-(void)pushToReactVC{
+    
+    UASBaseVC *rn = [NSClassFromString(@"YRReactVC") new];
+    
+    rn.title = @"REACTNATIVE";
+    
+    [self.navigationController pushViewController:rn animated:YES];
+    
+    
+}
+
 #pragma mark --- UITableView delegate && datasource
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     return 1;
@@ -395,6 +406,8 @@ static NSString *cellID = @"cellID";
     
     
     UIImageView *iconView = [[UIImageView alloc]init];
+    iconView.target = self;
+    iconView.aSelector = @selector(pushToReactVC);
     iconView.layer.cornerRadius = 47;
     iconView.layer.masksToBounds = YES;
     iconView.layer.borderWidth = 3;

shiku_im/shiku_im/文件夹5/UASGuideController.m

@@ -63,21 +63,33 @@
     btn.backgroundColor = [UIColor clearColor];
     btn.frame = CGRectMake(sv.bounds.size.width*3+(SCREEN_WIDTH-120)/2, sv.bounds.size.height-80, 120, 40);
     [sv addSubview:btn];
-    [btn addTarget:self action:@selector(enterHomeViewController) forControlEvents:UIControlEventTouchUpInside];
+    [btn addTarget:self action:@selector(enterHomeViewControllerScroll:) forControlEvents:UIControlEventTouchUpInside];
     
 }
 
 
-- (void)enterHomeViewController
+- (void)enterHomeViewControllerScroll:(BOOL)isScroll
 {
     UIScrollView *view = [self.view viewWithTag:2000];
+    
     [UIView animateWithDuration:0.2 animations:^{
         
         //平移
-        view.transform = CGAffineTransformMakeTranslation(-SCREEN_WIDTH, 0);
+        if (isScroll) {
+            
+            view.transform = CGAffineTransformMakeTranslation(-SCREEN_WIDTH, 0);
+            
+        }else{
+         
+            view.transform = CGAffineTransformMakeTranslation(0, -SCREEN_HEIGHT);
+            
+        }
+        
+    } completion:^(BOOL finished) {
+        
         [view removeFromSuperview];
         if ([[NSUserDefaults standardUserDefaults] boolForKey:isAutoLoginOrNot]) {//自动登录
-           
+            
             if (self.chooseNextVC) {
                 
                 self.chooseNextVC();
@@ -86,14 +98,12 @@
             
         }else{
             
-        loginVC *loginVc =  [[loginVC alloc]init];
+            loginVC *loginVc =  [[loginVC alloc]init];
             
-        [UIApplication sharedApplication].keyWindow.rootViewController = loginVc;
+            [UIApplication sharedApplication].keyWindow.rootViewController = loginVc;
             
         }
         
-    } completion:^(BOOL finished) {
-        
     }];
 }
 
@@ -104,7 +114,7 @@
         _pg.currentPage = curPageIndex;
         
         if (scrollView.contentOffset.x > scrollView.bounds.size.width * 3) {
-            [self enterHomeViewController];
+            [self enterHomeViewControllerScroll:YES];
         }
     }
 }