浏览代码

教练端生成 二维码 功能完成。

openlockPPP 1 年之前
父节点
当前提交
d63e7d572e

二进制
jiaPei.xcworkspace/xcuserdata/mimasigeling.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
jiaPei/ENUM.h

@@ -15,7 +15,7 @@
 //学员端请求
 #define defaultHttp isOfficial?  @"http://fj.jppt.com.cn/" : @"http://192.168.8.87:8080/xm"
 #define anotherDefaultHttp isOfficial?  @"https://zzjs.zzxcx.net" : @"http://192.168.8.87:8080"
-
+#define coachDefaultHttp isOfficial?  @"https://jsjp-admin1.zzxcx.net" : @"https://jsjp-admin1.zzxcx.net"
 
 //基础请求
 #define defaultHttpUrl isOfficial? @"appservice/student/" : @"appservice2/student/"

+ 34 - 2
jiaPei/Modules/OtherModules/PTObjectMolule/RQPTObjectMolule.m

@@ -53,6 +53,7 @@ static id rq_ptObjectModule = nil;
         resultBlock(NO);
         return;
     }
+   
     //新需求 - 2023-6-19
     //        二维码内容:
     //        #FJMN#xczx@@模拟器序列号@@时间戳
@@ -105,9 +106,13 @@ static id rq_ptObjectModule = nil;
             /// 二维码明文
             ///#ZJJP#12345678909@@1@@3310@@1677132394000
             ///#ZJJP#SIM卡号@@类型@@地区编号@@时间戳   (类型:1签到  2签退  3过程)
+        } else if ([testString containsString:@"#FJCOACH#"]) {
+            //testString = [testString substringFromIndex:9];
+            array = [testString componentsSeparatedByString:@"@@"];
+            [self bindStudentAppCoachIdArr:array];
+            return;
         }
-        
-        
+
         __block NSString *ptSubjectStr;
         if (_rqQRCodeType == RQQRCodeType_PTSC && !RQObjectIsNil(array[5]) && !RQObjectIsNil(array[7])) {
             ptSubjectStr = array[5];
@@ -181,6 +186,33 @@ static id rq_ptObjectModule = nil;
     }
 }
 
+//绑定教练id
+- (void)bindStudentAppCoachIdArr:(NSArray *)array {
+    //学员绑定教练ID(新需求) - 2023-07-06
+    //#FJCOACH#@@315483254@@3501
+    NSString *appCoachId = array[1];
+    NSString *dqbh = array[2];
+    if([dqbh isEqualToString:RQ_USER_MANAGER.currentUser.city]){
+        NSMutableArray *arr = [NSMutableArray array];
+        [arr addPro:@"appCoachId"   Value:appCoachId];
+        [arr addPro:@"city"   Value:RQ_USER_MANAGER.currentUser.city];
+        [arr addPro:@"id"   Value:RQ_USER_MANAGER.currentUser.outId];
+        [MBProgressHUD rq_showProgressHUD:@""];
+        [jiaPeiManager requestGetWithURL:@"jsjp-admin/open-api/tms/coachInfo/updateStudentAppCoachIdById" array:arr appendurlString:nil completion:^(id result) {
+            NSLog(@"dict=%@",result)
+            int code = [result[@"code"] intValue];
+            if(code==0){
+                //成功
+                NSLog(@"绑定成功");
+            }
+            [RQ_SHARE_FUNCTION showAlertWithMessage:result[@"msg"] completion:nil];
+            [MBProgressHUD rq_hideHUD];
+        }];
+    }else {
+        ShowMsg(@"教练和学员不在同一个地区,无法绑定!");
+    }
+}
+
 - (void)zjmnWithArr:(NSArray *)array {
     @weakify(self)
     [[RACScheduler mainThreadScheduler] afterDelay:0.5 schedule:^{

+ 3 - 0
jiaPei/OLD/Util/jiaPeiManager/jiaPeiManager.h

@@ -31,6 +31,9 @@
 + (void)requestGetAnythingWithURL:(NSString *)urlString appendurlString:(NSString *)appendurlString completion:(MyBlockType)finishBlock;
 + (void)requestGetAnythingWithURL:(NSString *)urlString array:(NSArray *)array completion:(MyBlockType)finishBlock;
 + (void)requestGetAnythingWithURL:(NSString *)urlString array:(NSArray *)array appendurlString:(NSString *)appendurlString completion:(MyBlockType)finishBlock;
+//不加密
++ (void)requestGetWithURL:(NSString *)urlString array:(NSArray *)array appendurlString:(NSString *)appendurlString completion:(MyBlockType)finishBlock;
+
 #pragma mark              POST 请求
 + (void)requestPostAnythingWithURL:(NSString *)urlString parameters:(NSDictionary *)parameters completion:(MyBlockType)finishBlock;
 

+ 69 - 0
jiaPei/OLD/Util/jiaPeiManager/jiaPeiManager.m

@@ -408,6 +408,75 @@
     [self requestGetAnythingWithURL:urlString array:array appendurlString:nil completion:finishBlock];
 }
 
++ (void)requestGetWithURL:(NSString *)urlString array:(NSArray *)array appendurlString:(NSString *)appendurlString completion:(MyBlockType)finishBlock
+{
+    NSString *urlS = [NSString stringWithFormat:@"%@/%@",coachDefaultHttp,urlString];
+    //设置请求管理器
+    AFHTTPSessionManager *afSessionManager = [AFHTTPSessionManager manager];
+    afSessionManager.requestSerializer  = [AFJSONRequestSerializer serializer];
+    afSessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    afSessionManager.requestSerializer.timeoutInterval = 30;
+    /// 安全策略
+    AFSecurityPolicy *securityPolicy = [AFSecurityPolicy defaultPolicy];
+    //allowInvalidCertificates 是否允许无效证书(也就是自建的证书),默认为NO
+    //如果是需要验证自建证书,需要设置为YES
+    securityPolicy.allowInvalidCertificates = YES;
+    //validatesDomainName 是否需要验证域名,默认为YES;
+    //假如证书的域名与你请求的域名不一致,需把该项设置为NO
+    //主要用于这种情况:客户端请求的是子域名,而证书上的是另外一个域名。因为SSL证书上的域名是独立的,假如证书上注册的域名是www.google.com,那么mail.google.com是无法验证通过的;当然,有钱可以注册通配符的域名*.google.com,但这个还是比较贵的。
+    securityPolicy.validatesDomainName = NO;
+    
+    afSessionManager.securityPolicy = securityPolicy;
+    /// 支持解析
+    afSessionManager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",
+                                                      @"text/json",
+                                                      @"text/javascript",
+                                                      @"text/html",
+                                                      @"text/plain",
+                                                      @"text/html; charset=UTF-8",
+                                                      nil];
+    NSMutableDictionary *parameters = nil;
+    if(array&&array.count){
+        parameters = [NSMutableDictionary dictionary];
+        for (NSDictionary *item in array) {
+            [parameters addEntriesFromDictionary:item];
+        }
+    }
+    [jiaPeiManager QMLog:urlS obj:array];
+    [afSessionManager GET:urlS parameters:parameters headers:nil progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        //NSLog(@"请求返回123-------><>%@",responseObject);
+        
+        if (responseObject == nil) {
+            NSDictionary *dic = nil;
+            finishBlock(dic);
+            return;
+        }
+        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject
+                                                            options:NSJSONReadingMutableContainers
+                                                              error:nil];
+        
+        //NSLog(@"请求返回123---------><>%@",dic);
+        [jiaPeiManager QMLog:urlS obj:dic];
+        finishBlock(dic);
+    } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        [jiaPeiManager QMLog:urlS obj:error.description];
+        //失败的时候 要把失败的事情传输回去 @{@"code":@"1",@"body":@"请求失败"}
+        //在AFNetworking方法error代码块中
+        if ([error.domain isEqualToString:NSURLErrorDomain]) {
+            // network error
+            finishBlock(@{@"code" : @"1",@"body" : @"请检查网络连接"});
+        } else {
+            NSString *errorStr = [NSError rq_tipsFromError:error];
+            if (errorStr && ![errorStr isEqualToString:@""]) {
+                finishBlock(@{@"code" : @"1",@"body" : errorStr});
+            } else {
+                NSDictionary *dic = nil;
+                finishBlock(dic);
+            }
+        }
+    }];
+}
+
 + (void)requestGetAnythingWithURL:(NSString *)urlString array:(NSArray *)array appendurlString:(NSString *)appendurlString completion:(MyBlockType)finishBlock {
     //生成请求加密后的url
     NSString *urlS = [jiaPeiManager getURLWithDict:[jiaPeiManager getDicWithArray:array] urlPre:urlString];