外勤人脸打卡优化

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4710,7 +4710,7 @@
 		7D2DA53E1DF55FAF00C2C4A8 /* icon_zan_nor222.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor222.png; sourceTree = "<group>"; };
 		7D2DA53F1DF55FAF00C2C4A8 /* icon_zan_nor333.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor333.png; sourceTree = "<group>"; };
 		7D2EFB871E4C43A400962098 /* icon_dakalandian_nor3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_dakalandian_nor3.png; sourceTree = "<group>"; };
-		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "$RL2N4PN.png"; sourceTree = "<group>"; };
+		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = $RL2N4PN.png; sourceTree = "<group>"; };
 		7D2FBD6A1E683D5500A08F1F /* JLHONGDIANDetailVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLHONGDIANDetailVC.h; path = myOA/JLHONGDIANDetailVC.h; sourceTree = "<group>"; };
 		7D2FBD6B1E683D5500A08F1F /* JLHONGDIANDetailVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLHONGDIANDetailVC.m; path = myOA/JLHONGDIANDetailVC.m; sourceTree = "<group>"; };
 		7D2FBD6E1E6841A000A08F1F /* NumButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumButton.h; path = myOA/NumButton.h; sourceTree = "<group>"; };
@@ -20012,10 +20012,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -20056,10 +20056,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -20094,10 +20094,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20121,18 +20121,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "shiku_im/shiku_im-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$DOUBANGO_HOME/bindings/_common",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
+					$DOUBANGO_HOME/bindings/_common,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO_HOME/tinySIP/include",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO_HOME/tinySIP/include,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20163,8 +20163,48 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[arch=*]" = (
+					"$(PROJECT_DIR)/shiku_im/LibBPush",
+					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(PROJECT_DIR)/shiku_im/RSA/include",
+					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					$DOUBANGO_LIBS,
+					"$(SRCROOT)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/youMeng",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20211,10 +20251,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20240,16 +20280,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
-					"$DOUBANGO_HOME/tinySIP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/bindings/_common",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
+					$DOUBANGO_HOME/tinySIP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/bindings/_common,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20257,7 +20297,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$DOUBANGO_LIBS",
+					$DOUBANGO_LIBS,
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im/controller/JONEWDYTableView.m

@@ -518,7 +518,7 @@
     
     NSDateFormatter  *dateformatter=[[NSDateFormatter alloc] init];
     
-    [dateformatter setDateFormat:@"YYYYMMdd"];
+    [dateformatter setDateFormat:@"yyyyMMdd"];
     
     NSString *  locationString=[dateformatter stringFromDate:newdate];
     //DLog(@"刷新时间接口=%@",locationString);

shiku_im/shiku_im/controller/myOA/JOOutWorkPlanVC.h

@@ -14,4 +14,9 @@
 
 @property(copy,nonatomic)void(^scheduleBlock)(void);
 
+/**
+ 判断外勤是否开启人脸打卡
+ */
+@property(nonatomic,assign) NSString *faceGo;
+
 @end

shiku_im/shiku_im/controller/myOA/JOOutWorkPlanVC.m

@@ -678,7 +678,6 @@
     
     NSMutableArray * _jingweidubrr;
     
-    int _faceGo;//判断外勤是否开启人脸打卡
 }
 
 @property (nonatomic,strong) AMapSearchAPI * searchAPI;
@@ -697,7 +696,6 @@
 
 @property(assign,nonatomic)BOOL isPunchHand;
 
-
 /**
  为了防止手动外勤对象提前释放后调用某个方法导致闪退
  */
@@ -705,9 +703,6 @@
 
 @end
 
-
-
-
 @implementation JOOutWorkPlanVC
 
 - (void)viewDidLoad
@@ -808,7 +803,6 @@
     
     self.isPunchHand = NO;
     
-    _faceGo = 0;
 }
 //2,设置导航栏
 - (void)setUpNavi
@@ -843,64 +837,89 @@
 #pragma mark --- 手动签到第一步
 -(void)punchCard
 {
-    [MBProgressHUD showMessage:@""];
-    
-    NSString *url = [NSString stringWithFormat:@"%@/mobile/getOutSetInfo.action?master=%@&sessionUser=%@&sessionId=%@",g_id,g_master,g_sessionUser,g_sessionId];
-    
-    url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    
-    UASNetworkManager *mannage = [UASNetworkManager shareManager];
-    
-    mannage.responseSerializer = [AFJSONResponseSerializer serializer];
-    
-    [mannage request:url method:POST parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
-        [MBProgressHUD hideHUD];
+    if (self.faceGo.length != 0) {
         
-        NSDictionary *rootDic = responseObject;
-        
-        if ([rootDic objectForKey:@"result"] == nil)
-        {
-            return ;
-        }
-        if ([[rootDic objectForKey:@"result"] isKindOfClass:[NSNull class]]) {
+        if ([self.faceGo isEqualToString:@"1"]) {
+            
+            [self FaceLoginJudgeMyself];
             
-            return;
-        }
-        
-        NSMutableArray * arr = [[NSMutableArray alloc]initWithArray:[NSDictionary changeType:[rootDic objectForKey:@"result"]]];
-        
-        if (arr.count == 0)
-        {
-            return;
         }
-        
-        for (id obj in rootDic[@"result"])
-        {
-
-            if ([[obj allKeys] containsObject:@"MO_FACESIGN"]) {
+        else if ([self.faceGo isEqualToString:@"fail"]) {
+            
+            //以防万一：工作台页面获取外勤设置接口失败时，重新获取外勤设置
+            
+            [MBProgressHUD showMessage:@""];
+            
+            NSString *url = [NSString stringWithFormat:@"%@/mobile/getOutSetInfo.action?master=%@&sessionUser=%@&sessionId=%@",g_id,g_master,g_sessionUser,g_sessionId];
+            
+            url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+            
+            UASNetworkManager *mannage = [UASNetworkManager shareManager];
+            
+            mannage.responseSerializer = [AFJSONResponseSerializer serializer];
+            
+            [mannage request:url method:POST parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+                [MBProgressHUD hideHUD];
+                
+                NSDictionary *rootDic = responseObject;
                 
-                NSString *faceSign = [NSString stringWithFormat:@"%@",obj[@"MO_FACESIGN"]];
+                if ([rootDic objectForKey:@"result"] == nil)
+                {
+                    return ;
+                }
+                if ([[rootDic objectForKey:@"result"] isKindOfClass:[NSNull class]]) {
+                    
+                    return;
+                }
+                
+                NSMutableArray * arr = [[NSMutableArray alloc]initWithArray:[NSDictionary changeType:[rootDic objectForKey:@"result"]]];
                 
-                if ([faceSign isEqualToString:@"1"]) {
+                if (arr.count == 0)
+                {
+                    return;
+                }
+                
+                for (id obj in rootDic[@"result"])
+                {
                     
-                    _faceGo = 1;
+                    if ([[obj allKeys] containsObject:@"MO_FACESIGN"]) {
+                        
+                        NSString *faceSign = [NSString stringWithFormat:@"%@",obj[@"MO_FACESIGN"]];
+                        
+                        if ([faceSign isEqualToString:@"1"]) {
+                            
+                            self.faceGo = faceSign;
+                            
+                        }
+                    }
                     
                 }
-            }
+                
+                if ([self.faceGo isEqualToString:@"1"]) {
+                    [self FaceLoginJudgeMyself];
+                }else{
+                    [self startPunchCard:nil];
+                }
+                
+            } failure:^(NSURLSessionDataTask *task, NSError *error) {
+                
+                [MBProgressHUD hideHUD];
+                
+                //万一此接口崩溃，还是要打卡的。
+                [self startPunchCard:nil];
+                
+            }];
             
         }
         
-        if (_faceGo) {
-            [self FaceLoginJudgeMyself];
-        }else{
+        else{
             [self startPunchCard:nil];
         }
         
-    } failure:^(NSURLSessionDataTask *task, NSError *error) {
-        
-        [MBProgressHUD hideHUD];
-        
-    }];
+    }else{
+        //其余公司无mo_facesign直接打卡
+        [self startPunchCard:nil];
+    }
 }
 
 #pragma mark --- 外勤打卡开始

shiku_im/shiku_im/controller/myOA/WorkTools/UASWorkManager.m

@@ -2133,9 +2133,9 @@
                                };
         
         [[UASNetworkManager shareManager] request:FORMAT(@"%@/mobile/signUploadPicture.action",g_id) method:POST parameters:dic constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-            if (self.imageData) {
-                [formData appendPartWithFileData:self.imageData name:@"img" fileName:@"file.jpg" mimeType:@"image/jpeg"];
-            }
+            
+            [formData appendPartWithFileData:self.imageData name:@"img" fileName:@"file.jpg" mimeType:@"image/jpeg"];
+            
         } progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
             SLog(@"成功上传附件");
             [MBProgressHUD hideHUD];

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.3.7</string>
+	<string>6.3.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -112,7 +112,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6.0.2</string>
+	<string>6.0.0</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>baidumap</string>

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

@@ -95,7 +95,7 @@
 
 @property (strong , nonatomic) CMPedometer *step;
 
-
+@property (nonatomic,assign) NSString *faceOpen;//外勤是否开启人脸打卡
 @end
 
 @implementation UASWorkMainVC
@@ -686,6 +686,7 @@
         [[NSUserDefaults standardUserDefaults] setObject:@"click" forKey:@"OANewGuidePunch2"];
     
         NSUserDefaults * user = [NSUserDefaults standardUserDefaults];
+        
         NSString * str= [NSString stringWithFormat:@"%@",[user objectForKey:@"OutPlanIsOpenOrClose"]];
         
         if ([str isEqualToString:@"1"])
@@ -693,6 +694,8 @@
             
             JOOutWorkPlanVC * ovc = [[JOOutWorkPlanVC alloc]init];
             
+            ovc.faceGo = self.faceOpen;
+            
             [self.navigationController pushViewController:ovc animated:YES];
 
         }
@@ -1252,45 +1255,60 @@
     
 }
 
-//获取是否为自动外勤接口
+#pragma mark --- 获取是否为自动外勤接口
 -(void)getAutoOutWorkData{
-    
-    
-    NSString * ipStr = [[NSUserDefaults standardUserDefaults] stringForKey:@"ipAndPort"];
-    NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    
-    NSString *url = [NSString stringWithFormat:@"%@/mobile/getOutSetInfo.action?master=%@&sessionUser=%@&sessionId=%@",ipStr,g_master,g_sessionUser,sessionId];
+
+    NSString *url = [NSString stringWithFormat:@"%@/mobile/getOutSetInfo.action?master=%@&sessionUser=%@&sessionId=%@",g_id,g_master,g_sessionUser,g_sessionId];
     
     url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     
     UASNetworkManager *mannage = [UASNetworkManager shareManager];
-    //拼接sessionID
-    NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
-    //设置cookie
-    [mannage.requestSerializer setValue:paramSessionId forHTTPHeaderField:@"Cookie"];
-    [mannage.requestSerializer setValue:[NSString stringWithFormat:@"%@",g_sessionUser] forHTTPHeaderField:@"sessionUser"];
+    
     mannage.responseSerializer = [AFJSONResponseSerializer serializer];
+    
     [mannage request:url method:POST parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
         
-        responseObject = [NSDictionary changeType:responseObject];
+        NSDictionary *rootDic = responseObject;
         
-        NSUserDefaults * user=[NSUserDefaults standardUserDefaults];
-        NSArray * a = responseObject[@"result"];
-        if ([a isEqual:@""]) {
+        if ([rootDic objectForKey:@"result"] == nil)
+        {
+            return ;
+        }
+        if ([[rootDic objectForKey:@"result"] isKindOfClass:[NSNull class]]) {
             
-        }else{
-            for (id obj in a) {
-                
-                [user setObject:[NSString stringWithFormat:@"%@",obj[@"MO_AUTOSIGN"]] forKey:@"OutPlanIsOpenOrClose"];
-                
-                [[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithFormat:@"%@",obj[@"MO_NEEDPROCESS"]] forKey:@"JOOUTisOrNoPostSPL"];
+            return;
+        }
+        
+        NSMutableArray * arr = [[NSMutableArray alloc]initWithArray:[NSDictionary changeType:[rootDic objectForKey:@"result"]]];
+        
+        if (arr.count == 0)
+        {
+            return;
+        }
+
+        NSUserDefaults * user = [NSUserDefaults standardUserDefaults];
+        
+        for (id obj in rootDic[@"result"]) {
+            
+            [user setObject:[NSString stringWithFormat:@"%@",obj[@"MO_AUTOSIGN"]] forKey:@"OutPlanIsOpenOrClose"];
+            
+            [user setObject:[NSString stringWithFormat:@"%@",obj[@"MO_NEEDPROCESS"]] forKey:@"JOOUTisOrNoPostSPL"];
+            
+            //外勤设置是否有MO_FACESIGN来判断是否开启外勤人脸打卡
+            if ([[obj allKeys] containsObject:@"MO_FACESIGN"]) {
                 
+                NSString *faceSign = [NSString stringWithFormat:@"%@",obj[@"MO_FACESIGN"]];
+
+                self.faceOpen = faceSign;
                 
             }
         }
-        //获取系统权限
+        
         
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        
+        self.faceOpen = @"fail";
+        
         NSData *returnData = [[error userInfo] objectForKey:@"com.alamofire.serialization.response.error.data"];
         if (returnData)
         {