Browse Source

The last upload. Goodbye & Good luck ~

huangyp 5 years ago
parent
commit
34dd730209

+ 2 - 2
shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -20574,7 +20574,7 @@
 					"$(inherited)",
 					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
 				);
-				MARKETING_VERSION = 6.5.7;
+				MARKETING_VERSION = 6.5.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20698,7 +20698,7 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				MARKETING_VERSION = 6.5.7;
+				MARKETING_VERSION = 6.5.9;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-framework",

+ 0 - 162
shiku_im/shiku_im/controller/CRMViewController.m

@@ -132,9 +132,6 @@ static NSString *cellID = @"cellID";
     self.view.backgroundColor = BGKJ_COLOR;
     self.title = Localized(@"UU_Sales_Board");
     
-    //设置导航栏
-    [self setNavi];
-    
     _scrollV = [[UIScrollView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
     
     _scrollV.showsHorizontalScrollIndicator = NO;
@@ -184,165 +181,6 @@ static NSString *cellID = @"cellID";
     
 }
 
-- (void)setNavi
-{
-    UIButton *btn1 = [UIButton buttonWithType:UIButtonTypeSystem];
-    btn1.frame = CGRectMake(0, 5, 20, 20);
-    UIImageView *image2 = [[UIImageView alloc]initWithFrame:CGRectMake(0, 5, 20, 20)];
-    image2.image = [UIImage imageNamed:@"crm_main_add"];
-    [btn1 addSubview:image2];
-    [btn1 addTarget:self action:@selector(moreAction:) forControlEvents:UIControlEventTouchUpInside];
-    UIBarButtonItem *BBI1 = [[UIBarButtonItem alloc]initWithCustomView:btn1];
-    
-    //隐藏打卡键
-    UIButton *hehe = [UIButton buttonWithType:UIButtonTypeSystem];
-    hehe.frame = CGRectMake(0,5, 30, 30);
-    [hehe setTitle:@"😈" forState:UIControlStateNormal];
-    [hehe addTarget:self action:@selector(getdakaCode:) forControlEvents:UIControlEventTouchUpInside];
-    UIBarButtonItem *BBI2 = [[UIBarButtonItem alloc]initWithCustomView:hehe];
-    
-    
-    UIButton *btn4 = [UIButton buttonWithType:UIButtonTypeSystem];
-    btn4.frame = CGRectMake(0,5, 20, 20);
-    UIImageView *image3 = [[UIImageView alloc]initWithFrame:CGRectMake(0, 5, 20, 20)];
-    image3.image = [UIImage imageNamed:@"crm_main_add"];
-    [btn4 addSubview:image3];
-    [btn4 addTarget:self action:@selector(dan:) forControlEvents:UIControlEventTouchUpInside];
-    UIBarButtonItem *BBI3 = [[UIBarButtonItem alloc]initWithCustomView:btn4];
-    
-    if ([g_server.myself.userNickname isEqualToString:@"黄耀鹏"]) {
-        self.navigationItem.rightBarButtonItems = @[BBI2];
-    }else{
-//        self.navigationItem.rightBarButtonItems = @[BBI1];
-    }
-    
-}
-
--(void)dan:(UIButton *)sender
-{
-//    FaceUserListVC *vc = [[FaceUserListVC alloc]init];
-//    [self.navigationController pushViewController:vc animated:YES];
-    
-    // 设置鉴权
-//    NSString* licensePath = [[NSBundle mainBundle] pathForResource:FACE_LICENSE_NAME ofType:FACE_LICENSE_SUFFIX];
-//    NSAssert([[NSFileManager defaultManager] fileExistsAtPath:licensePath], @"license文件路径不对,请仔细查看文档");
-//    [[FaceSDKManager sharedInstance] setLicenseID:FACE_LICENSE_ID andLocalLicenceFile:licensePath];
-//    [[NetAccessModel sharedInstance] getAccessTokenWithAK:FACE_API_KEY SK:FACE_SECRET_KEY];
-//
-//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//
-//        [[NetAccessModel sharedInstance] deleteFaceUserGroupWithGroupID:FORMAT(@"%@",@"20000087") completion:^(NSError *error, id resultObject) {
-//            [MBProgressHUD hideHUD];
-//
-//            NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:resultObject options:NSJSONReadingAllowFragments error:nil];
-//            SLog(@"人脸识别数据:%@",dict);
-//
-//            //先判断接口请求是否成功
-//            NSString *success = FORMAT(@"%@",dict[@"error_msg"]);
-//            if ([success isEqualToString:@"SUCCESS"]) {
-//
-//            }
-//        }];
-//    });
-}
-
-//隐藏打卡编号
--(void)getdakaCode:(UIButton *)sender
-{
-    NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    NSString *ip=[UASUserInfo shareManager].urlIp;
-    
-    NSString *url = [NSString stringWithFormat:@"%@common/getCodeString.action?type=2&caller=CardLog&master=%@&sessionUser=%@&sessionId=%@",ip,g_master,g_sessionUser,sessionId];
-    
-    DLog(@"aaaaaaaa:%@",url);
-    
-    url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    
-    UASNetworkManager *manager = [UASNetworkManager shareManager];
-    manager.responseSerializer = [AFJSONResponseSerializer serializer];
-    
-    //拼接sessionID
-    NSString *paramSessionId=[@"" stringByAppendingFormat:@"JSESSIONID=%@",sessionId];
-    //设置cookie
-    [manager.requestSerializer setValue:paramSessionId forHTTPHeaderField:@"Cookie"];
-    
-    [manager request:url method:POST parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
-        
-        NSString *code = [NSString stringWithFormat:@"%@",responseObject[@"code"]];
-        [self daka:code];
-    } failure:^(NSURLSessionDataTask *task, NSError *error) {
-        
-        DLog(@"请求失败:%@",error);
-        [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showAlert:@"编号获取失败"];
-    }];
-    
-}
-
-//隐藏打卡
--(void)daka:(NSString *)clcode
-{
-    UASNetworkManager *manager1=[UASNetworkManager shareManager];
-    manager1.responseSerializer=[AFHTTPResponseSerializer serializer];
-    
-    //取出sessionID和IP和员工编号
-    NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
-    
-    NSString * ips=[UASUserInfo shareManager].urlIp;
-    
-    NSString * userID=[[NSUserDefaults standardUserDefaults] objectForKey:@"erpaccount"];
-    
-    NSString * userNum=[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_LoginName];
-    
-    NSString * userName = [[NSUserDefaults standardUserDefaults] stringForKey:@"personName"];
-    
-    /**
-     1,打卡地址
-     2,距离目的地距离
-     3,打卡员工编号
-     4,打卡人名字
-     5,打卡手机型号
-     6,打卡人电话
-     // 7,打卡时间
-     */
-    
-    //    (int)(5 + (arc4random() % (9 – 5 + 1)));
-    //    int a = 50 + (arc4random() % (70 - 50 + 1));
-    int a = arc4random() % 10;
-    int b = 3 + (arc4random() % (9 - 3 + 1));
-    int c = arc4random() % 10;
-    int d = arc4random() % 10;
-    NSString *distance = [NSString stringWithFormat:@"%d%d.%d%d",b,a,c,d];
-    
-    NSDictionary *formstore = @{@"cl_address":@"广东省深圳市南山区科技南五路5",
-                                @"cl_distance":distance,
-                                @"cl_emcode":userID,
-                                @"cl_emname":userName,
-                                @"cl_location":@"iOS内勤自动打卡",
-                                @"cl_phone":userNum,
-                                @"cl_code":clcode
-                                };
-    
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:formstore options:NSJSONWritingPrettyPrinted error:nil];
-    
-    NSString *formStore=[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    
-    
-    NSString *url=[@"" stringByAppendingFormat:@"%@mobile/saveCardLog.action?Caller=CardLog&formStore=%@&facecard=1&master=%@&sessionUser=%@&sessionId=%@&_noc=1",ips,formStore,g_master,g_sessionUser,sessionId];
-    
-    DLog(@"未转吗url=%@",url);
-    
-    NSString *urlStringUTF8 = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    [manager1 request:urlStringUTF8 method:POST parameters:nil progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
-        
-        NSData *data=responseObject;
-        id rootDic =[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];
-        DLog(@"打卡上传成功%@",rootDic);
-        [MBProgressHUD showSuccess:@"打卡成功"];
-    } failure:^(NSURLSessionDataTask *task, NSError *error) {
-        
-    }];
-}
-
 -(void)getIsFormalClient //用来判断是否正式客户
 {
     NSString *sessionId=[[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];

+ 3 - 3
shiku_im/shiku_im/controller/审批流详情/LYYApprovalDetailVC.m

@@ -3565,8 +3565,8 @@
                                 if (model1.fpd_id.length == 0 && model1.fpd_fpid.length != 0) {
                                     
                                     UITextField *textfiled1 = [self.view viewWithTag:11111+a+1];
-                                    if (textfiled1.tag == sender.tag - 22222)
-                                    {
+//                                    if (textfiled1.tag == sender.tag - 22222 )
+//                                    {
                                         for (NSInteger b  = 0; b < arr.count; b ++) {
                                             
                                             NSDictionary *dic1 = arr[b];
@@ -3575,7 +3575,7 @@
                                                 textfiled1.text =dic[dic1[@"dbGridField"]];
                                             }
                                         }
-                                    }
+//                                    }
                                 }
                                 
                             }