Merge branch 'AppStore' of ssh://10.10.100.21/source/iOSUU

# Conflicts:
#	shiku_im/shiku_im/RN/Controllers/YRReactVC.m
#	shiku_im/shiku_im/controller/UASLoadVC.m
#	shiku_im/shiku_im/shiku_im-Info.plist

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -1472,6 +1472,7 @@
 		99B34858212A6F2400CE6332 /* UASScheduleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B34857212A6F2400CE6332 /* UASScheduleCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99B3485B212A8E5A00CE6332 /* UASScheduleModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B3485A212A8E5A00CE6332 /* UASScheduleModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99B3485E212A9A9C00CE6332 /* UASAddCircleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B3485D212A9A9C00CE6332 /* UASAddCircleView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		99B99A3F2338552E008B6C70 /* UITextField+extension.m in Sources */ = {isa = PBXBuildFile; fileRef = 99B99A3E2338552E008B6C70 /* UITextField+extension.m */; };
 		99BC69CE2155E5910063450C /* UASClientDocuSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99BC69CD2155E5910063450C /* UASClientDocuSearchVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99BE77A6212BC27400BC62FA /* UASScheduleSetVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99BE77A5212BC27400BC62FA /* UASScheduleSetVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		99BECF7A2153931400BA85CF /* UASClientUpVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99BECF792153931400BA85CF /* UASClientUpVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -5103,7 +5104,7 @@
 		7DFB0D361E52A5C9001C4361 /* icon_riqikkk_nor1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_riqikkk_nor1.png; sourceTree = "<group>"; };
 		7DFB0D391E52E91B001C4361 /* JLCONPersonalModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JLCONPersonalModel.h; sourceTree = "<group>"; };
 		7DFB0D3A1E52E91B001C4361 /* JLCONPersonalModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JLCONPersonalModel.m; sourceTree = "<group>"; };
-		8409055617B693CF00F5C28D /* shiku_im.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = shiku_im.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		8409055617B693CF00F5C28D /* UU互联.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "UU互联.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		8409055917B693CF00F5C28D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		8409055B17B693CF00F5C28D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		8409055D17B693CF00F5C28D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -5166,6 +5167,8 @@
 		99B3485A212A8E5A00CE6332 /* UASScheduleModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASScheduleModel.m; sourceTree = "<group>"; };
 		99B3485C212A9A9C00CE6332 /* UASAddCircleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASAddCircleView.h; sourceTree = "<group>"; };
 		99B3485D212A9A9C00CE6332 /* UASAddCircleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASAddCircleView.m; sourceTree = "<group>"; };
+		99B99A3D2338552E008B6C70 /* UITextField+extension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITextField+extension.h"; sourceTree = "<group>"; };
+		99B99A3E2338552E008B6C70 /* UITextField+extension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITextField+extension.m"; sourceTree = "<group>"; };
 		99BC69CC2155E5910063450C /* UASClientDocuSearchVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientDocuSearchVC.h; sourceTree = "<group>"; };
 		99BC69CD2155E5910063450C /* UASClientDocuSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientDocuSearchVC.m; sourceTree = "<group>"; };
 		99BE77A4212BC27400BC62FA /* UASScheduleSetVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASScheduleSetVC.h; sourceTree = "<group>"; };
@@ -12132,7 +12135,7 @@
 		8409055717B693CF00F5C28D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8409055617B693CF00F5C28D /* shiku_im.app */,
+				8409055617B693CF00F5C28D /* UU互联.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -12312,6 +12315,15 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		99B99A3C233854F9008B6C70 /* TextField */ = {
+			isa = PBXGroup;
+			children = (
+				99B99A3D2338552E008B6C70 /* UITextField+extension.h */,
+				99B99A3E2338552E008B6C70 /* UITextField+extension.m */,
+			);
+			name = TextField;
+			sourceTree = "<group>";
+		};
 		99C399A62146450D004D3306 /* Others */ = {
 			isa = PBXGroup;
 			children = (
@@ -14183,6 +14195,7 @@
 		B858A46C1D62E4D800BAA0E2 /* lib(工具类) */ = {
 			isa = PBXGroup;
 			children = (
+				99B99A3C233854F9008B6C70 /* TextField */,
 				996069D9230CD21A0073E089 /* WebView */,
 				9911B8E92308D5CE0064F498 /* UIDevice */,
 				99D0B9F721378E4C0002DFC4 /* TIPopGesture */,
@@ -17354,7 +17367,7 @@
 			);
 			name = shiku_im;
 			productName = shiku_im;
-			productReference = 8409055617B693CF00F5C28D /* shiku_im.app */;
+			productReference = 8409055617B693CF00F5C28D /* UU互联.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -19721,6 +19734,7 @@
 				CCE242E218FFB8EB00A3CB5A /* SBJsonUTF8Stream.m in Sources */,
 				AA8DDFE11E9E16E60069D10A /* CustomeApproveIdeaView.m in Sources */,
 				7DA6733C1FC40460007D2EA3 /* UITableView+WFEmpty.m in Sources */,
+				99B99A3F2338552E008B6C70 /* UITextField+extension.m in Sources */,
 				20ACAC131F5FA3230029B9CB /* UASTabbar.m in Sources */,
 				CC1D1924195455710029F7FD /* JXTextView.m in Sources */,
 				CCE2415B18FFB8EB00A3CB5A /* VoiceConverter.mm in Sources */,
@@ -20576,7 +20590,7 @@
 				);
 				PODS_ROOT = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.usoftchina.Youxin;
-				PRODUCT_NAME = shiku_im;
+				PRODUCT_NAME = "UU互联";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = YouxinKaiFaTest;
 				SDKROOT = iphoneos;
@@ -20698,7 +20712,7 @@
 				);
 				PODS_ROOT = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.usoftchina.Youxin;
-				PRODUCT_NAME = shiku_im;
+				PRODUCT_NAME = "UU互联";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = YouxinKaiFaTest;
 				SDKROOT = iphoneos;

shiku_im/shiku_im.xcodeproj/xcshareddata/xcschemes/shiku_im.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8409055517B693CF00F5C28D"
-               BuildableName = "shiku_im.app"
+               BuildableName = "UU&#x4e92;&#x8054;.app"
                BlueprintName = "shiku_im"
                ReferencedContainer = "container:shiku_im.xcodeproj">
             </BuildableReference>
@@ -27,19 +27,17 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8409055517B693CF00F5C28D"
-            BuildableName = "shiku_im.app"
+            BuildableName = "UU&#x4e92;&#x8054;.app"
             BlueprintName = "shiku_im"
             ReferencedContainer = "container:shiku_im.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -56,13 +54,18 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8409055517B693CF00F5C28D"
-            BuildableName = "shiku_im.app"
+            BuildableName = "UU&#x4e92;&#x8054;.app"
             BlueprintName = "shiku_im"
             ReferencedContainer = "container:shiku_im.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "OS_ACTIVITY_MODE"
+            value = "disable"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Debug"
@@ -75,7 +78,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8409055517B693CF00F5C28D"
-            BuildableName = "shiku_im.app"
+            BuildableName = "UU&#x4e92;&#x8054;.app"
             BlueprintName = "shiku_im"
             ReferencedContainer = "container:shiku_im.xcodeproj">
          </BuildableReference>

shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -41,26 +41,24 @@ static NSMutableDictionary * rootDic = nil;
 
 -(void)createUI{
     
-    
     [self addNotification];
     
     NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
     
     jsCodeLocation = [CodePush bundleURL];
-//
-    self.moduleName = self.moduleName?:@"UU_RN";
+    //
+    self.moduleName = self.moduleName?:@"RNApp";
     
-
     NSString * strUrl = @"http://10.1.80.97:8081/index.bundle?platform=ios";
 
     jsCodeLocation = [NSURL URLWithString:strUrl] ;
+
     
     if (!rootDic) {
         
         rootDic = [NSMutableDictionary dictionary];
         
-        
-        RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"RNApp"
+        RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:self.moduleName
                                                      initialProperties:@{@"UU":@"UU_RN"}
                                                          launchOptions:nil];
         
@@ -149,7 +147,7 @@ static NSMutableDictionary * rootDic = nil;
 //        appDelegate.allowRotation = NO;
 //        //切换到竖屏
 //        [UIDevice switchNewOrientation:UIInterfaceOrientationPortrait];
-//
+//        
 //        [self.chartVC dismissViewControllerAnimated:YES completion:nil];
 //
 //    }
@@ -169,8 +167,6 @@ static NSMutableDictionary * rootDic = nil;
     //允许转成横屏
     appDelegate.allowRotation = YES;
     
-    
-    
 }
 
 

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -16,6 +16,7 @@
 #import "UASLinkAdVC.h"
 #import "XGPush.h"
 #import "NSString+secri.h"
+#import "UITextField+extension.h"
 #define INSET 9
 #define WIDTH SCREEN_WIDTH-INSET*2
 #define HEIGHT 50
@@ -71,6 +72,10 @@
 
 -(void)viewWillAppear:(BOOL)animated{
     
+    [super viewWillAppear:animated];
+    
+    if (iOS13) return;
+    
     UIView *statusBar = [[[UIApplication sharedApplication] valueForKey:@"statusBarWindow"] valueForKey:@"statusBar"];
     if ([statusBar respondsToSelector:@selector(setBackgroundColor:)]) {
         statusBar.backgroundColor = Color(40, 40, 39, 1);
@@ -83,6 +88,10 @@
 
 -(void)viewWillDisappear:(BOOL)animated
 {
+    [super viewWillDisappear:animated];
+    
+    if (iOS13) return;
+    
     UIView *statusBar = [[[UIApplication sharedApplication] valueForKey:@"statusBarWindow"] valueForKey:@"statusBar"];
     if ([statusBar respondsToSelector:@selector(setBackgroundColor:)]) {
         statusBar.backgroundColor = [UIColor clearColor];
@@ -207,7 +216,7 @@
     _phone.textColor = [UIColor colorWithHexString:@"#FFFFFF" alpha:1.0];
     _phone.keyboardType = UIKeyboardTypeNumberPad;
     _phone.font = FONT_SIZE(18);
-    [_phone setValue:HexColor(@"#FFFFFF") forKeyPath:@"_placeholderLabel.textColor"];
+    [_phone setPlaceHolderColor:HexColor(@"#FFFFFF")];
     [firstView addSubview:_phone];
     
     //添加监听事件
@@ -230,7 +239,7 @@
     _pwd.backgroundColor = [UIColor clearColor];
     _pwd.textColor = [UIColor colorWithHexString:@"#FFFFFF" alpha:1.0];
     _pwd.font = FONT_SIZE(18);
-    [_pwd setValue:HexColor(@"#FFFFFF") forKeyPath:@"_placeholderLabel.textColor"];
+    [_pwd setPlaceHolderColor:HexColor(@"#FFFFFF")];
     [secondView addSubview:_pwd];
     
     [_pwd addTarget:self action:@selector(pwdTextChanged:) forControlEvents:UIControlEventAllEditingEvents|UIControlEventValueChanged];

shiku_im/shiku_im/controller/UASLoadVC.m

@@ -149,10 +149,13 @@
 -(void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-//    UIView *statusBar = [[[UIApplication sharedApplication] valueForKey:@"statusBarWindow"] valueForKey:@"statusBar"];
-//    if ([statusBar respondsToSelector:@selector(setBackgroundColor:)]) {
-//        statusBar.backgroundColor = [UIColor clearColor];
-//    }
+
+    if (iOS13) return;
+    
+    UIView *statusBar = [[[UIApplication sharedApplication] valueForKey:@"statusBarWindow"] valueForKey:@"statusBar"];
+    if ([statusBar respondsToSelector:@selector(setBackgroundColor:)]) {
+        statusBar.backgroundColor = [UIColor clearColor];
+    }
 }
 
 -(void)viewWillDisappear:(BOOL)animated

shiku_im/shiku_im/controller/myOA/B2BChangeClassVC.m

@@ -12,10 +12,7 @@
 #import "JLClassModel.h" //自定义的
 #import "JLTimeAttendanceSettingVC.h" //考勤时间设置
 #import "JLGetWeekDayVC.h" //选择考勤星期
-
-
-
-
+#import "UITextField+extension.h"
 
 
 @interface B2BChangeClassVC ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,UIAlertViewDelegate>
@@ -563,25 +560,19 @@
         _nameLabel.text = nameArr[indexPath.row];
         [cell.contentView addSubview:_nameLabel];
         
-        
-        
-        
         _nameClassTextField = [[UITextField alloc] initWithFrame:CGRectMake(self_width-190, 8, 170, 45)];
         _nameClassTextField.text =_dataArr[indexPath.row];
         _nameClassTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
         _nameClassTextField.adjustsFontSizeToFitWidth = YES;
         _nameClassTextField.textAlignment = NSTextAlignmentRight;
         _nameClassTextField.placeholder = Localized(@"UU_custom_pleaseInputMust");
-        [_nameClassTextField setValue: JLMOREN_TEXT_COLOR forKeyPath:@"_placeholderLabel.textColor"];
+        [_nameClassTextField setPlaceHolderColor:JLMOREN_TEXT_COLOR];
         _nameClassTextField.font = FONT_SIZE(10);
         _nameClassTextField.textColor = JLMOREN_TEXT_COLOR;
         _nameClassTextField.delegate = self;
         
-        
-            
-            _nameClassTextField.enabled  = NO;
+        _nameClassTextField.enabled  = NO;
      
-        
         [cell.contentView addSubview:_nameClassTextField];
         cell.selectionStyle=UITableViewCellSelectionStyleNone;
         cell.backgroundColor = BGKJ_COLOR;

shiku_im/shiku_im/controller/myOA/JLChangeClassVC.m

@@ -19,8 +19,7 @@
 #import "JLConflictPersonnel.h" /*冲突人员界面*/
 #import "JLCONPersonalModel.h"
 #import "JLCalendarSelectSchduleVC.h"
-
-
+#import "UITextField+extension.h"
 
 
 @interface JLChangeClassVC ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,UIAlertViewDelegate>
@@ -925,7 +924,7 @@
         _nameClassTextField.adjustsFontSizeToFitWidth = YES;
         _nameClassTextField.textAlignment = NSTextAlignmentRight;
         _nameClassTextField.placeholder =Localized(@"UU_custom_pleaseInputMust");
-        [_nameClassTextField setValue: JLMOREN_TEXT_COLOR forKeyPath:@"_placeholderLabel.textColor"];
+        [_nameClassTextField setPlaceHolderColor:JLMOREN_TEXT_COLOR];
         _nameClassTextField.font = FONT_SIZE(10);
         _nameClassTextField.textColor = JLMOREN_TEXT_COLOR;
         _nameClassTextField.delegate = self;

shiku_im/shiku_im/controller/myOA/JLPunchCardViewController.m

@@ -2561,6 +2561,8 @@
         
     }];
     
+    vc.modalPresentationStyle = UIModalPresentationFullScreen;
+    
     [self.navigationController presentViewController:vc animated:YES completion:^{
         
     }];

shiku_im/shiku_im/controller/myOA/JOGetLocationViewController.m

@@ -818,6 +818,12 @@ updatingLocation:(BOOL)updatingLocation
         
     }
     
+    if (iOS13) {
+        
+        return @"4G";
+        
+    }
+    
     UIApplication *app = [UIApplication sharedApplication];
     NSArray *children = [[[app valueForKeyPath:@"statusBar"]valueForKeyPath:@"foregroundView"]subviews];
     NSString *state = [[NSString alloc]init];

shiku_im/shiku_im/controller/myOA/UITextField+extension.h

@@ -0,0 +1,19 @@
+//
+//  UITextField+extension.h
+//  shiku_im
+//
+//  Created by liujl on 2019/9/23.
+//
+
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UITextField (extension)
+
+- (void)setPlaceHolderColor:(UIColor *)placeHolderColor;
+
+@end
+
+NS_ASSUME_NONNULL_END

shiku_im/shiku_im/controller/myOA/UITextField+extension.m

@@ -0,0 +1,23 @@
+//
+//  UITextField+extension.m
+//  shiku_im
+//
+//  Created by liujl on 2019/9/23.
+//
+
+#import "UITextField+extension.h"
+
+@implementation UITextField (extension)
+
+- (void)setPlaceHolderColor:(UIColor *)placeHolderColor{
+
+    NSAssert(self.placeholder != nil, @"占位符不能为空");
+    
+    NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:self.placeholder attributes:@{NSForegroundColorAttributeName : placeHolderColor}];
+    
+    self.attributedPlaceholder = placeholder;
+    
+}
+
+@end
+

shiku_im/shiku_im/controller/myOA/YRWebVC.m

@@ -14,7 +14,7 @@
 #import <JavaScriptCore/JavaScriptCore.h>
 
 
-@interface YRWebVC ()<WKUIDelegate,WKNavigationDelegate,WKScriptMessageHandler,UINavigationControllerDelegate>
+@interface YRWebVC ()<WKUIDelegate,WKNavigationDelegate,WKScriptMessageHandler,UINavigationControllerDelegate,UIScrollViewDelegate>
 
 @property(strong,nonatomic)UIProgressView *progress;
 
@@ -90,6 +90,10 @@
     if (self.titleName) {
         
         self.title = self.titleName;
+        self.webView.scrollView.bounces = NO;
+        self.webView.scrollView.minimumZoomScale = 1.0;
+        self.webView.scrollView.maximumZoomScale = 1.0;
+        self.webView.scrollView.delegate = self;
         
     }
     
@@ -116,21 +120,17 @@
     
     if ([name isEqualToString:@"event"]) {
         
-        // 打开相册
         if ([message.body isEqualToString:@"ChartInterfaceOrientationMaskPortrait"]) {//横屏
            
             [self chartInterfaceOrientationMaskLandscapeRight];
             
-        }else {//竖屏
+        }else if ([message.body isEqualToString:@"ChartInterfaceOrientationMaskLandscapeRight"]) {//竖屏
             
             [self chartInterfaceOrientationMaskPortrait];
             
         }
         
-    
     }
-        
-    
     
 }
 //横屏
@@ -158,10 +158,11 @@
     
     [self.navigationController setNavigationBarHidden:NO animated:YES];
     
-     self.im_interactivePopDisabled = NO;
+    self.im_interactivePopDisabled = NO;
     
 }
 
+
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
     
     if ([keyPath isEqualToString:@"estimatedProgress"]) {
@@ -189,6 +190,8 @@
     
 }
 
+
+
 -(void)dealloc{
     
     [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];

shiku_im/shiku_im/controller/myOA/报销单/LYYReimbursementVC.m

@@ -35,6 +35,7 @@
 #import "LYYPageManyImageVC.h"
 #import "LYYInPutView.h"
 #import "UASInputTextView.h"
+#import "UITextField+extension.h"
 #define IOS8 ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0?YES:NO)
 #define insert_photo_tag -100000
 @interface LYYReimbursementVC ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,UIImagePickerControllerDelegate,QBImagePickerControllerDelegate,UIScrollViewDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
@@ -790,7 +791,7 @@
         _nameClassTextField.adjustsFontSizeToFitWidth = YES;
         _nameClassTextField.textAlignment = NSTextAlignmentRight;
         _nameClassTextField.placeholder =Localized(@"UU_custom_pleaseInput");
-        [_nameClassTextField setValue: JLMOREN_TEXT_COLOR forKeyPath:@"_placeholderLabel.textColor"];
+        [_nameClassTextField setPlaceHolderColor:JLMOREN_TEXT_COLOR];
         _nameClassTextField.font = FONT_SIZE(14);
         _nameClassTextField.textColor = JLMOREN_TEXT_COLOR;
         _nameClassTextField.delegate = self;

shiku_im/shiku_im/controller/审批流详情/LYYApprovalCell.m

@@ -7,6 +7,7 @@
 //
 
 #import "LYYApprovalCell.h"
+#import "UITextField+extension.h"
 @interface LYYApprovalCell()
 @property (strong , nonatomic) UIView * lineView ;
 @end
@@ -44,16 +45,13 @@
    
     [self.contentView addSubview:_nameLabel1];
     
-    
-    
-    
     _nameClassTextField = [[UITextField alloc] initWithFrame:CGRectMake(SCREEN_WIDTH-190, 0, 170, 39.2)];
     
     _nameClassTextField.clearButtonMode = UITextFieldViewModeWhileEditing;
     _nameClassTextField.adjustsFontSizeToFitWidth = YES;
     _nameClassTextField.textAlignment = NSTextAlignmentRight;
     _nameClassTextField.placeholder =Localized(@"UU_custom_pleaseInputMust");
-    [_nameClassTextField setValue: JLMOREN_TEXT_COLOR forKeyPath:@"_placeholderLabel.textColor"];
+    [_nameClassTextField setPlaceHolderColor:JLMOREN_TEXT_COLOR];
     _nameClassTextField.font = FONT_SIZE(12);
     _nameClassTextField.textColor = JLMOREN_TEXT_COLOR;
   

shiku_im/shiku_im/shiku_im-Prefix.pch

@@ -154,6 +154,7 @@
 
 #define ChiLocaled(key) [[NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:[NSString stringWithFormat:@"zh-Hans"] ofType:@"lproj"]] localizedStringForKey:(key) value:nil table:@"InfoPlist"]
 
+#define iOS13 [[[UIDevice currentDevice] systemVersion] floatValue] >= 13.0
 #define isIOS7 [[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0
 #define iOS11  [[[UIDevice currentDevice] systemVersion] floatValue] >= 11.0
 #define iOS10 [[[UIDevice currentDevice] systemVersion] floatValue] < 11.0

shiku_im/shiku_im/一元捐/项目列表/搜索/SearchProjectVC.m

@@ -12,7 +12,7 @@
 #import "ZXProjectListViewModel.h"
 #import "ZXPayView.h"
 #import "LYYACtivityCenterCell.h"
-
+#import "UITextField+extension.h"
 #import "iflyMSC/IFlyMSC.h"
 #import "IATConfig.h"
 #import "ISRDataHelper.h"
@@ -198,8 +198,6 @@ static NSString * cellID = @"cellID";
     
     
     
-//    [searchField setValue:HexColor(@"#eeeeee") forKeyPath:@"_placeholderLabel.textColor"];
-    
 //    searcher.backgroundColor = [UIColor whiteColor];
 //    searcher.layer.cornerRadius = 15;
 //    searcher.layer.masksToBounds = YES;

shiku_im/shiku_im/文件夹1/BIService/Controllers/YRBiServeVC.m

@@ -60,23 +60,23 @@
 -(void)getRecentData{
 
     NSString *filePath = [self getRecentDataPath];
-
+    
     NSMutableArray *cacheArr = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath];
-
+    
     self.recentArr = [cacheArr mutableCopy];
-
+    
     if (self.recentArr == nil) {
 
         self.recentArr = [NSMutableArray array];
+        
     }
 
 }
 
 -(void)getDataFromSever{
 
-
     [MBProgressHUD showMessage:@"" toView:self.view];
-
+    
     NSArray * arr = @[Color(47, 149, 221, 1),Color(155, 125,201, 1),Color(222, 147, 91, 1),Color(245, 116, 116, 1),Color(139, 214, 127, 1),Color(104, 210, 201, 1)];
     color = [arr mutableCopy];
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
@@ -85,7 +85,7 @@
     NSString *sessionUser = [[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
     //    /common/getSearchByTree.action
     NSString *url = [NSString stringWithFormat:@"%@/common/getSearchByTree.action?emcode=%@&master=%@&sessionUser=%@&sessionId=%@",[UASUserInfo shareManager].urlIp,emcode,master,sessionUser,sessionId];
-
+    
     UASNetworkManager * manager = [UASNetworkManager shareManager];
     [manager POST:url parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
         SLog(@"返回的数据是:%@",responseObject);
@@ -93,6 +93,9 @@
         NSMutableArray * mutArr = [[NSMutableArray alloc]init];
         NSMutableArray * dicArr = [[NSMutableArray alloc]init];
 
+        [_alldataArr removeAllObjects];
+        [_modelNameArr removeAllObjects];
+        [_ColorArr removeAllObjects];
         for (int i = 0; i<_partDataArr.count; i++) {
 
             dicArr = [_partDataArr[i] objectForKey:@"list"];
@@ -102,11 +105,11 @@
             [mutArr removeAllObjects];
 
             for (int j=0; j<dicArr.count; j++) {
-
+                
                 ReportMenuModel * model = [ReportMenuModel mj_objectWithKeyValues:dicArr[j]];
-
+                
                 [mutArr addObject:model];
-               
+                
             }
             [_alldataArr addObject:[mutArr copy]];
 
@@ -115,12 +118,52 @@
         for (int i = 0; i< (double)_partDataArr.count/6; i++) {
             [_ColorArr addObjectsFromArray:[arr copy]];
         }
+        
+        //比对缓存的项目中是否有项目已经不存在
+        for (int i=0; i<_recentArr.count; i++) {
+            
+            BOOL isExist = NO;
+            
+            ReportMenuModel *recModel = _recentArr[i];
+            
+            for (int j=0 ; j<_alldataArr.count;j++) {
+                
+                NSArray *arr = _alldataArr[j];
+                
+                for (ReportMenuModel *rModel in arr) {
+                    
+                    if ([rModel.caller isEqualToString:recModel.caller]) {
+                        
+                        isExist = YES;
+                        //存在的情况，更新匹配正确的颜色
+                        if (j<_ColorArr.count) {
+                            
+                            recModel.cellColor = _ColorArr[j];
+                            
+                        }
+                        
+                    }
+                    
+                }
+                
+            }
+            
+            
+            if (!isExist) {//不存在移除
+                
+                [_recentArr removeObject:recModel];
+                i--;
+                
+            }
+            
+        }
+        
         if(_alldataArr.count > 0){
 
             if (_recentArr.count != 0) {
-                if (self.recentArr.count != 0) {
+                if (self.recentArr.count != 0 && ![_alldataArr containsObject:_recentArr]) {
 
-                    [_modelNameArr insertObject:@"最近查询业务" atIndex:0];
+                    [_modelNameArr insertObject:@"最近浏览" atIndex:0];
                     [self.alldataArr insertObject:_recentArr atIndex:0];
 
                 }
@@ -136,27 +179,33 @@
 
         }
         [self.collectionView reloadData];
+        
+        [self.collectionView.mj_header endRefreshing];
+        
         //SLog(@"获取的标题是:%@",_titleArr);
         SLog(@"获取的模型是:%@",_alldataArr);
         [MBProgressHUD hideHUDForView:self.view animated:YES];
-
+        
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
-
+        
         [MBProgressHUD hideHUDForView:self.view animated:YES];
-        SLog(@"返回的错误是什么呢:%@",error);
+        
         NSData *returnData = [[error userInfo] objectForKey:@"com.alamofire.serialization.response.error.data"];
         if (returnData) {
             NSDictionary *content = [NSJSONSerialization JSONObjectWithData:returnData options:NSJSONReadingMutableContainers error:nil];//转换数据格式
-
+            
             NSString *errorStr = [NSString stringWithFormat:@"%@",[content objectForKey:@"exceptionInfo"]];
-
-            DLog(@"错误的原因:%@",errorStr);
+            
             [JOShowMessageFromNavi showDropViewWithMessage:errorStr ToNavi:self.navigationController withColor:nil];
-        }
-        else{
+            
+        }else{
+            
             [JOShowMessageFromNavi showDropViewWithMessage:@"请检查网络情况" ToNavi:self.navigationController withColor:nil];
+            
         }
 
+        [self.collectionView.mj_header endRefreshing];
+        
     }];
 
 }
@@ -173,7 +222,6 @@
 
 -(void)initNavigation{
 
-
     self.title = @"BI报表";
     
     self.view.backgroundColor = [UIColor whiteColor];
@@ -185,7 +233,7 @@
     [btn2 addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *bbi2 = [[UIBarButtonItem alloc]initWithCustomView:btn2];
     self.navigationItem.leftBarButtonItems = @[bbi2];
-
+    
     UICollectionViewFlowLayout *layoutView = [[UICollectionViewFlowLayout alloc] init];
     layoutView.scrollDirection = UICollectionViewScrollDirectionVertical;
     layoutView.itemSize = CGSizeMake(100, 95);
@@ -193,7 +241,7 @@
     layoutView.footerReferenceSize = CGSizeMake(SCREEN_HEIGHT, 0.3);
     layoutView.sectionInset = UIEdgeInsetsMake(0.3, 0, 0, 0);
     self.navigationController.automaticallyAdjustsScrollViewInsets = YES;
-
+    
     _searchBarView=[[UIView alloc]initWithFrame:CGRectMake(0,0,self_width,40)];
     _searchBarView.backgroundColor=Color(235,233,233,1.0);
     JOSearchBar * searcher=[JOSearchBar new];
@@ -224,6 +272,13 @@
         make.left.right.bottom.equalTo(self.view);
 
     }];
+    
+    self.collectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
+       
+        [self getDataFromSever];
+        
+    }];
+    
     self.collectionView.delegate = self;
     self.collectionView.dataSource = self;
     [self.collectionView registerClass:[DataSearchCell class] forCellWithReuseIdentifier:@"YRBiServiceCellID"];
@@ -358,10 +413,9 @@
             DataSearcherHeaderView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"reusableView" forIndexPath:indexPath];
             headerView.lable2.text = _modelNameArr[indexPath.section];
             headerView.lable1.backgroundColor = [UIColor blackColor];
-
+            
             return headerView;
-
-
+            
         }else{
 
             DataSearcherHeaderView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"reusableView" forIndexPath:indexPath];
@@ -497,7 +551,7 @@
     if (_recentArr.count == 0) {
         
         [_alldataArr insertObject:_recentArr atIndex:0];
-        [_modelNameArr insertObject:@"最近查询业务" atIndex:0];
+        [_modelNameArr insertObject:@"最近浏览" atIndex:0];
         
     }
     
@@ -571,13 +625,11 @@
     if (!_recentArr) {
 
         _recentArr = [NSMutableArray array];
-
+        
     }
 
     return _recentArr;
 
 }
 
-
-
 @end

shiku_im/shiku_im/文件夹3/ChildView/SettingVC.m

@@ -174,6 +174,8 @@ static NSString *cellID = @"cellID";
         
         UASBasNavController * navi = [[UASBasNavController alloc]initWithRootViewController:vc];
         
+        navi.modalPresentationStyle = UIModalPresentationFullScreen;
+        
         if (statusX) {
             
             [navi.navigationBar setBackgroundImage:[UIImage imageNamed:@"UU_newbg3"] forBarMetrics:UIBarMetricsDefault];

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

@@ -868,6 +868,8 @@ static NSString *cellID = @"cellID";
     [self.navigationController setNeedsNavigationBackground:0.0f];
 }
 
+
+
 #pragma mark --- viewWillDisappear
 -(void)viewWillDisappear:(BOOL)animated
 {