diff --git a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj index 9ed82bd..a3e55d8 100644 --- a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj +++ b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -444,7 +444,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/XinjiangProject/XinjiangProject/Define/StatusMacros.h b/XinjiangProject/XinjiangProject/Define/StatusMacros.h index 3dc4bc6..b883c79 100755 --- a/XinjiangProject/XinjiangProject/Define/StatusMacros.h +++ b/XinjiangProject/XinjiangProject/Define/StatusMacros.h @@ -91,7 +91,6 @@ #define Http @"https://api-jkglpt.iosp.ydpt.tech"// #define H5DevHost @"api-jkglpt.iosp.ydpt.tech"// #define IntervenH5 @"https://console-jkglpt.iosp.ydpt.tech" -#define BASEURL @"https://yyjk.cqygjk.com" //北边接口前缀 #define SCHEME @"https" // diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h deleted file mode 100644 index 3a02ddc..0000000 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// SDGETHealthTokenManager.h -// XinjiangProject -// -// Created by 仁康信息 on 2024/1/4. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -typedef void (^successBlock)(NSDictionary *responseObject); -typedef void (^failedBlock)(NSError *error); - -@interface SDGETHealthTokenManager : NSObject - -+(SDGETHealthTokenManager *)getHealthTokenManager; - -- (void)getTokenSuccess:(successBlock)success - failed:(failedBlock)failed; - - --(void)getUserJoinStatusSuccess:(successBlock)success - failed:(failedBlock)failed; -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m deleted file mode 100644 index aacb864..0000000 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m +++ /dev/null @@ -1,195 +0,0 @@ -// -// SDGETHealthTokenManager.m -// XinjiangProject -// -// Created by 仁康信息 on 2024/1/4. -// - -#import "SDGETHealthTokenManager.h" -#include -#import "RSAObjC.h" - -@interface SDGETHealthTokenManager () -@property (nonatomic,strong)AFHTTPSessionManager *session; -@end - -@implementation SDGETHealthTokenManager - - -#pragma mark - 初始化单例 -+(SDGETHealthTokenManager *)getHealthTokenManager -{ - static SDGETHealthTokenManager *manager = nil; - static dispatch_once_t pred; - dispatch_once(&pred, ^{ - manager = [[self alloc] init]; - }); - return manager; -} --(id)init -{ - self = [super init]; - if (self) { - _session = [AFHTTPSessionManager manager]; - - /***********请求的序列化**********/ - //传Json 对象 - _session.requestSerializer = [AFJSONRequestSerializer serializer]; - //设置超时时间 - [_session.requestSerializer willChangeValueForKey:@"timeoutInterval"]; - _session.requestSerializer.timeoutInterval = 10.f; - [_session.requestSerializer didChangeValueForKey:@"timeoutInterval"]; - - /**********响应的序列化**************/ - _session.responseSerializer = [AFJSONResponseSerializer serializer]; - _session.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",@"text/json",@"text/plain" ,@"text/javascript",@"text/html",nil]; - } - return self; - - -} - --(void)httpRequestWithURL:(NSString *)url - parameters:(NSDictionary*)paraDic - hearders:(NSDictionary *)hearder - success:(successBlock)success - failed:(failedBlock)failed -{ - - NSString *fullURL = [NSString stringWithFormat:@"%@/%@",BASEURL,url]; - [_session POST:fullURL parameters:paraDic headers:hearder progress:^(NSProgress * _Nonnull uploadProgress) { - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { - success(responseObject); - } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - failed(error); - }]; -} - - - --(void)httpRequestGetWithURL:(NSString *)url - parameters:(NSDictionary*)paraDic - hearders:(NSDictionary *)hearder - success:(successBlock)success - failed:(failedBlock)failed -{ - - NSString *fullURL = [NSString stringWithFormat:@"%@/%@",BASEURL,url]; - - [_session GET:fullURL parameters:paraDic headers:hearder progress:nil success:^(NSURLSessionTask *task, NSDictionary * responseObject) { - - success(responseObject); - } failure:^(NSURLSessionTask *operation, NSError *error) { - failed(error); - }]; -} - -- (void)getTokenSuccess:(successBlock)success failed:(failedBlock)failed { - - NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; - - NSMutableDictionary * headerDic = [[NSMutableDictionary alloc] init]; - NSDate * date = [NSDate date]; - NSDateFormatter *matter = [[NSDateFormatter alloc] init]; - matter.dateFormat = @"yyyyMMddHHmmss"; - NSString * dateString = [matter stringFromDate:date]; - - [dic setObject:dateString forKey:@"timeSign"]; - NSMutableDictionary * sigDic = [[NSMutableDictionary alloc] init]; - [sigDic setObject:dateString forKey:@"timeSign"]; - NSString * needSersy = [sigDic modelToJSONString]; -// 时间戳 - NSError *parseError; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:sigDic options:0 error:&parseError]; - if (parseError) { - //解析出错 - } - NSString * str = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; -// 时间戳 - NSMutableString * str3 = [[NSMutableString alloc]initWithString:str]; - - [str3 replaceOccurrencesOfString:@"\\" withString:@"" options:1 range:NSMakeRange(0, str3.length)]; - - [str3 appendString:@"dd05f1c54d63749eda95f9fa6d49v442a"]; - - NSString * md5str = [self getMd5_32Bit_String:str3]; - - [headerDic setObject:dateString forKey:@"X-TIMESTAMP"]; - [headerDic setObject:md5str forKey:@"X-Sign"]; - - [self httpRequestGetWithURL:@"gateway/sys/getPublicKey" parameters:dic hearders:@{@"X-TIMESTAMP":dateString,@"X-Sign":md5str} success:^(NSDictionary * _Nonnull responseObject) { - - if ([responseObject.allKeys containsObject:@"code"]) { - - if ([[responseObject objectForKey:@"code"] integerValue] == 200) - { - NSString *pubkey ; - if ([responseObject.allKeys containsObject:@"result"]) { - pubkey = [NSString stringWithFormat:@"-----BEGIN PUBLIC KEY-----\n%@\n-----END PUBLIC KEY-----",responseObject[@"result"]]; - // 时间戳 - } - HQUserInfo * user = [HQCommonUtils keyedUnarchiverWithKey:LoginUserInfo]; - - NSString *ret = [RSAObjC encrypt:user.idCard PublicKey:pubkey]; - DLog(@"encrypted: %@", ret); - - if (ValidStr(ret)) { -// KPostNotification(KNotificationLoginStateChange, @NO); - return; - } - - NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - [parmDic setObject:[NSString stringWithFormat:@"RSA_%@",ret] forKey: @"idcard"]; - - NSDate * date = [NSDate date]; - NSDateFormatter *matter = [[NSDateFormatter alloc] init]; - matter.dateFormat = @"yyyyMMddHHmmss"; - NSString * dateString = [matter stringFromDate:date]; - - NSError *parseError; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:parmDic options:0 error:&parseError]; - if (parseError) { - //解析出错 - } - NSString * str = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; - // 时间戳 - NSMutableString * str3 = [[NSMutableString alloc]initWithString:str]; - - [str3 replaceOccurrencesOfString:@"\\" withString:@"" options:1 range:NSMakeRange(0, str3.length)]; - - [str3 appendString:@"dd05f1c54d63749eda95f9fa6d49v442a"]; - - NSString * md5str = [self getMd5_32Bit_String:str3]; - - - [self httpRequestWithURL:@"gateway/sys/thirdAppGetTokenByIdCard" parameters:parmDic hearders:@{@"X-TIMESTAMP":dateString,@"X-Sign":md5str} success:success failed:failed]; - } - else - { - success(responseObject); - - } - } - - - } failed:^(NSError * _Nonnull error) { - - }]; - -} - - - -- (NSString *)getMd5_32Bit_String:(NSString *)srcString { -// 参数 srcString 传进来的字符串 -// 参数 isUppercase 是否需要大小写 - const char *cStr = [srcString UTF8String]; - unsigned char digest[CC_MD5_DIGEST_LENGTH]; - CC_MD5( cStr, (CC_LONG)srcString.length, digest ); - NSMutableString *result = [NSMutableString stringWithCapacity:CC_MD5_DIGEST_LENGTH * 2]; - for(int i = 0; i < CC_MD5_DIGEST_LENGTH; i++) - [result appendFormat:@"%02X", digest[i]]; - return result; -} - -@end diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.h b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.h deleted file mode 100644 index 3e45231..0000000 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SDHttpRequest.h -// colorPrintingMaster -// -// Created by 青山小明 on 17/5/3. -// Copyright © 2017年 zhangming. All rights reserved. -// - -#import -typedef void (^successBlock)(NSDictionary *responseObject); -typedef void (^failedBlock)(NSError *error); - -@interface SDHttpRequest : NSObject -+(SDHttpRequest *)httpRequest; - -#pragma mark - 首页 -- (void)getInterWatchDataUrlWithParm:(NSMutableDictionary *)parmDic - Success:(successBlock)success - failed:(failedBlock)failed; - - -#pragma mark - - --(void)postWithParameter:(NSDictionary *)para - images:(NSArray *)images - success:(successBlock)success - failed:(failedBlock)failed; - -//获取服务地址 -- (void)getChangeUrlSuccess:(successBlock)success - failed:(failedBlock)failed; - -@end diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.m deleted file mode 100644 index 5ee23a2..0000000 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// SDHttpRequest.m -// colorPrintingMaster -// -// Created by 青山小明 on 17/5/3. -// Copyright © 2017年 zhangming. All rights reserved. -// - -#import "SDHttpRequest.h" -#import "AFNetworking.h" -#include -#import "RSAObjC.h" -//static SDHttpRequest *singleton = nil; - -@interface SDHttpRequest () -@property (nonatomic,strong)AFHTTPSessionManager *session; -@end - -@implementation SDHttpRequest -#pragma mark - 初始化单例 -+(SDHttpRequest *)httpRequest -{ - static SDHttpRequest *manager = nil; - static dispatch_once_t pred; - dispatch_once(&pred, ^{ - manager = [[self alloc] init]; - }); - return manager; -} --(id)init -{ - self = [super init]; - if (self) { - _session = [AFHTTPSessionManager manager]; - - /***********请求的序列化**********/ - //传Json 对象 - _session.requestSerializer = [AFJSONRequestSerializer serializer]; - //设置超时时间 - [_session.requestSerializer willChangeValueForKey:@"timeoutInterval"]; - _session.requestSerializer.timeoutInterval = 30.f; - [_session.requestSerializer didChangeValueForKey:@"timeoutInterval"]; - - /**********响应的序列化**************/ - _session.responseSerializer = [AFJSONResponseSerializer serializer]; - _session.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json",@"text/json",@"text/plain" ,@"text/javascript",@"text/html",nil]; - } - return self; -} -#pragma mark---请求调用的方法 --(void)httpRequestWithURL:(NSString *)url - parameters:(NSDictionary*)paraDic - success:(successBlock)success - failed:(failedBlock)failed -{ - NSUserDefaults * tokenDefaul = [NSUserDefaults standardUserDefaults]; - - NSString * token = [tokenDefaul objectForKey:KHEALTHTOKEN]; - - - - NSString *fullURL = [NSString stringWithFormat:@"%@/%@",BASEURL,url]; - [_session POST:fullURL parameters:paraDic headers: @{@"X-Access-Token":token} progress:^(NSProgress * _Nonnull uploadProgress) { - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { - success(responseObject); - } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - failed(error); - }]; -} - -- (void)uploadImagesWithURL:(NSString *)url - parameters:(NSDictionary *)paraDic - hearders:(NSDictionary *)hearder - imagesKey:(NSString *)imagesKey - images:(NSArray *)images - success:(successBlock)success - failed:(failedBlock)failed -{ - NSString *fullURL = [NSString stringWithFormat:@"%@/%@",BASEURL,url]; - - [_session POST:fullURL parameters:paraDic headers:hearder constructingBodyWithBlock:^(id _Nonnull formData) { - for (UIImage *image in images) - { - [formData appendPartWithFileData:UIImageJPEGRepresentation(image, 0.5) - name:imagesKey - fileName:@"1.jpeg" - mimeType:@"image/jpeg"]; - } - - } progress:^(NSProgress * _Nonnull uploadProgress) { - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { - success(responseObject); - } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - failed(error); - }]; -} - --(void)httpRequestGetWithURL:(NSString *)url - parameters:(NSDictionary*)paraDic - success:(successBlock)success - failed:(failedBlock)failed -{ - NSUserDefaults * tokenDefaul = [NSUserDefaults standardUserDefaults]; - - NSString * token = [tokenDefaul objectForKey:KHEALTHTOKEN]; - - NSString *fullURL = [NSString stringWithFormat:@"%@/%@",BASEURL,url]; - - [_session GET:fullURL parameters:paraDic headers:@{@"X-Access-Token":token} progress:nil success:^(NSURLSessionTask *task, NSDictionary * responseObject) { - - success(responseObject); - } failure:^(NSURLSessionTask *operation, NSError *error) { - failed(error); - }]; -} - - -#pragma mark - 首页 -- (void)getInterWatchDataUrlWithParm:(NSMutableDictionary *)parmDic - Success:(successBlock)success - failed:(failedBlock)failed { - - //参数 - [self httpRequestGetWithURL:@"health-watch/watchH5Api/indexDataNew" - parameters:parmDic success:success failed:failed]; -} - - - - - - -@end diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.h similarity index 99% rename from XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h rename to XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.h index a6a6cb3..b617a0d 100755 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.h @@ -9,7 +9,7 @@ #import #import "JKCQNetworkingWithCache.h" -@interface JKCQAPI : NSObject +@interface XJPNetAPI : NSObject @property (nonatomic,strong) JKCQNetworkingWithCache * httpRequest; diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.m similarity index 99% rename from XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m rename to XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.m index f5fb6d2..08879b0 100755 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.m @@ -1,18 +1,12 @@ -// -// API.m -// XZYNetworking -// -// Created by 徐自由 on 2017/12/25. -// Copyright © 2017年 徐自由. All rights reserved. -// -#import "JKCQAPI.h" + +#import "XJPNetAPI.h" #define needToken httpRequest.needToken #define isLoginFlag httpRequest.isLoginFlag -@implementation JKCQAPI +@implementation XJPNetAPI #pragma mark - init方法 @synthesize httpRequest; diff --git a/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m b/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m index 17f6a13..b082862 100644 --- a/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m +++ b/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m @@ -76,10 +76,10 @@ [TUIChatConfig defaultConfig].enableAudioCall = isAudio; // YES：开启，NO：关闭 // 把 TUIC2CChatViewController 添加到自己的 ViewController - HQBaseViewController * currentVc =(HQBaseViewController *)[HQCommonUtils getCurrentVC]; + XJBaseViewController * currentVc =(XJBaseViewController *)[HQCommonUtils getCurrentVC]; if (!currentVc) { - currentVc = [[HQBaseViewController alloc] init]; + currentVc = [[XJBaseViewController alloc] init]; } [currentVc addChildViewController:vc]; [currentVc.view addSubview:vc.view]; diff --git a/XinjiangProject/XinjiangProject/Manager/UserManager/HQUserInfo.m b/XinjiangProject/XinjiangProject/Manager/UserManager/HQUserInfo.m index cb080a3..574353f 100755 --- a/XinjiangProject/XinjiangProject/Manager/UserManager/HQUserInfo.m +++ b/XinjiangProject/XinjiangProject/Manager/UserManager/HQUserInfo.m @@ -51,21 +51,40 @@ - (void)setUserInfo:(NSDictionary *)userInfo { + if (![userInfo isKindOfClass:[NSDictionary class]]) { + return; + } _userInfo = userInfo; - self.user_id = [_userInfo objectForKey:@"id"]; - self.avatar = [NSString stringWithFormat:@"%@%@",ResourceAddress,[_userInfo objectForKey:@"avatar"]]; - self.phone = [_userInfo objectForKey:@"phone"]; - self.realname = [_userInfo objectForKey:@"realname"]; - self.username = [_userInfo objectForKey:@"username"]; - self.sex = [_userInfo objectForKey:@"sex"]; - self.idCard = [_userInfo objectForKey:@"idCard"]; - self.personType = [_userInfo objectForKey:@"personType"]; - self.secondDepart = [_userInfo objectForKey:@"secondDepart"]; - self.sex_dictText = [_userInfo objectForKey:@"sex_dictText"]; - self.depart_id = [self.secondDepart objectForKey:@"id"]; - self.parentId = [self.secondDepart objectForKey:@"parentId"]; - self.departName = [self.secondDepart objectForKey:@"departName"]; + + // 一个小工具块，用于安全取值（避免 NSNull） + id (^safeValue)(id obj) = ^id(id obj) { + return (obj && ![obj isKindOfClass:[NSNull class]]) ? obj : nil; + }; + + self.user_id = safeValue(userInfo[@"id"]); + + NSString *avatarPath = safeValue(userInfo[@"avatar"]); + self.avatar = avatarPath ? [NSString stringWithFormat:@"%@%@", ResourceAddress, avatarPath] : nil; + + self.phone = safeValue(userInfo[@"phone"]); + self.realname = safeValue(userInfo[@"realname"]); + self.username = safeValue(userInfo[@"username"]); + self.sex = safeValue(userInfo[@"sex"]); + self.idCard = safeValue(userInfo[@"idCard"]); + self.personType = safeValue(userInfo[@"personType"]); + self.sex_dictText = safeValue(userInfo[@"sex_dictText"]); + + NSDictionary *secondDepart = safeValue(userInfo[@"secondDepart"]); + if ([secondDepart isKindOfClass:[NSDictionary class]]) { + self.secondDepart = secondDepart; + self.depart_id = safeValue(secondDepart[@"id"]); + self.parentId = safeValue(secondDepart[@"parentId"]); + self.departName = safeValue(secondDepart[@"departName"]); + } else { + self.secondDepart = nil; + self.depart_id = self.parentId = self.departName = nil; + } } diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.h b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.h index f15a5a2..8838c66 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.h +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.h @@ -13,7 +13,6 @@ //初始化服务 -(void)initService; -- (void)chageUrlService; //初始化 window -(void)initWindow; diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m index 8bb3ce9..bc2345f 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m @@ -6,7 +6,7 @@ // #import "AppDelegate+AppService.h" -#import "HQBaseTabBarController.h" +#import "XJBaseTabBarController.h" //#import "XJLoginViewController.h" #import "XJLoginTopChangeViewController.h" #import @@ -65,7 +65,7 @@ } - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } #pragma mark ————— 初始化window ————— @@ -75,13 +75,13 @@ self.window.backgroundColor = KWhiteColor; //直接进入显示登录页面 // if ([HQCommonUtils isLogin]) { - self.mainTabBar = [HQBaseTabBarController new]; + self.mainTabBar = [XJBaseTabBarController new]; self.mainTabBar.delegate =self; self.window.rootViewController = self.mainTabBar; [self.window makeKeyAndVisible]; // }else { // HQLoginViewController * loginvc = [[HQLoginViewController alloc] init]; -// HQBaseNavigationController * nav = [[HQBaseNavigationController alloc] initWithRootViewController:loginvc]; +// XJBaseNavigationController * nav = [[XJBaseNavigationController alloc] initWithRootViewController:loginvc]; // self.window.rootViewController = nav; // } // [self.window makeKeyAndVisible]; @@ -96,102 +96,6 @@ [[TUICallEngine createInstance] addObserver:self]; } -#pragma mark:请求前缀 -- (void)chageUrlService { - - AFHTTPSessionManager *session=[AFHTTPSessionManager manager]; - // AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager]; - - session.responseSerializer.acceptableContentTypes=[NSSet setWithObjects:@"application/json",@"text/json",@"text/javascript",@"text/html",@"text/plain", nil]; - //超时时间 - - session.requestSerializer.timeoutInterval= 30.f; - session.responseSerializer = [AFHTTPResponseSerializer serializer]; - - session.requestSerializer = [AFJSONRequestSerializer serializer]; - - session.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone]; - - NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - - - // 获取应用的版本号 - NSString * version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; - // 将版本号按照点（.）分割成数组 - NSArray * components = [version componentsSeparatedByString:@"."]; - - // 获取数组中的最后一个元素 - NSString * lastComponent = [components lastObject]; - // 如果需要将其转换为整数 - NSInteger lastNumber = [lastComponent integerValue]; - - [parmDic setObject:@(lastNumber) forKey:@"version"]; - [parmDic setObject:@"com.question.QinghaiProvince" forKey:@"pkg"]; - [session GET:@"https://base.icdat.cn/v2/url" parameters:parmDic headers:@{@"X-ClientSign":@"Quarry"} progress:^(NSProgress * _Nonnull downloadProgress) { - - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { - - NSString * dataString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; - DLog(@"response\n%@\n",dataString); - NSData *requestData = [dataString dataUsingEncoding:NSUTF8StringEncoding]; - - id myResult = [NSJSONSerialization JSONObjectWithData:requestData options:NSJSONReadingMutableContainers error:nil]; - //判断是否为字典 - if ([myResult isKindOfClass:[NSDictionary class]]) { - - NSDictionary *response = (NSDictionary *)myResult; - if ([response.allKeys containsObject:@"result"]) { - NSDictionary * resultDic = [response objectForKey:@"result"]; - - if ([resultDic.allKeys containsObject:@"api"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"api"] forKey:@"HTTPS"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - NSString * apiString = [resultDic objectForKey:@"api"]; - //判断是否正在审 - BOOL isExmine; - if ([apiString containsString:@"api.out.icdat.cn"]) { //正在审 - isExmine = true; - }else - { - isExmine = false; - } - [[NSUserDefaults standardUserDefaults] setObject:@(isExmine) forKey:@"isExmine"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - - if ([resultDic.allKeys containsObject:@"h5"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"h5"] forKey:@"IntervenH5"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - if ([resultDic.allKeys containsObject:@"h5Host"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"h5Host"] forKey:@"H5DevHost"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - if ([resultDic.allKeys containsObject:@"health"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"health"] forKey:@"BASEURL"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - KPostNotification(KNotificAgreeProtoocl, nil); - } - } - - } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - NSString * statusCode = [error.userInfo objectForKey:@"NSLocalizedDescription"]; - //请求超时 - if (error.code == -1001) { - [EasyTextView showErrorText:@"请求超时"]; - } - [[NSUserDefaults standardUserDefaults] setObject:@"https://api.cqygjk.com" forKey:@"HTTPS"]; - [[NSUserDefaults standardUserDefaults] setObject:@"https://yyjk.cqygjk.com/" forKey:@"BASEURL"]; - [[NSUserDefaults standardUserDefaults] setObject:@"api.cqygjk.com" forKey:@"IntervenH5"]; - [[NSUserDefaults standardUserDefaults] setObject:@"https://api.cqygjk.com" forKey:@"H5DevHost"]; - - [[NSUserDefaults standardUserDefaults] synchronize]; - KPostNotification(KNotificAgreeProtoocl, nil); - }]; - -} - #pragma mark: 键盘回收 - (void)initIQKeyBord { @@ -255,7 +159,6 @@ [[NSUserDefaults standardUserDefaults] synchronize]; //更新用户授权高德SDK隐私协议状态. since 8.1.0 [MAMapView updatePrivacyAgree:AMapPrivacyAgreeStatusDidAgree]; - [self chageUrlService]; }]; @@ -264,7 +167,6 @@ [[NSUserDefaults standardUserDefaults] synchronize]; //更新用户授权高德SDK隐私协议状态. since 8.1.0 [MAMapView updatePrivacyAgree:AMapPrivacyAgreeStatusNotAgree]; - [self chageUrlService]; }]; [alert addAction:conform]; @@ -315,7 +217,7 @@ if (islogin) {//登录成功 重置Tabbar self.mainTabBar = nil; - self.mainTabBar = [HQBaseTabBarController new]; + self.mainTabBar = [XJBaseTabBarController new]; self.mainTabBar.delegate =self; self.window.rootViewController = self.mainTabBar; [self.window makeKeyAndVisible]; @@ -325,7 +227,7 @@ self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; self.window.backgroundColor = KWhiteColor; XJLoginTopChangeViewController * loginvc = [[XJLoginTopChangeViewController alloc] init]; - HQBaseNavigationController * nav = [[HQBaseNavigationController alloc] initWithRootViewController:loginvc]; + XJBaseNavigationController * nav = [[XJBaseNavigationController alloc] initWithRootViewController:loginvc]; self.window.rootViewController = nav; [self.window makeKeyAndVisible]; diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.h b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.h index 4498f81..a29f730 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.h +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.h @@ -6,7 +6,7 @@ // #import -#import "HQBaseTabBarController.h" +#import "XJBaseTabBarController.h" /**腾讯IM**/ #import "TUIDefine.h" #import "TUIBaseChatViewController.h" @@ -22,7 +22,7 @@ @property (nonatomic,assign)NSInteger allowRotate; -@property (strong, nonatomic) HQBaseTabBarController * mainTabBar; +@property (strong, nonatomic) XJBaseTabBarController * mainTabBar; @property (nonatomic,assign)NSInteger unreadNumber; diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m index 0aeb297..7f8dc66 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m @@ -19,11 +19,7 @@ //前缀请求 //初始化高德地图 - [self configureAPIKey]; - - //前缀请求 - [self chageUrlService]; - + [self configureAPIKey]; [self initService]; //初始化window [self initWindow]; diff --git a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h b/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h deleted file mode 100644 index f2df855..0000000 --- a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// DownPDFFileVC.h -// XinjiangProject -// -// Created by 仁康信息 on 2023/12/1. -// - -#import "HQBaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface DownPDFFileVC : HQBaseViewController - -@property (nonatomic, strong) NSString * PDFUrl; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.h b/XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.h similarity index 77% rename from XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.h rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.h index d5f667e..5910317 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.h +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.h @@ -1,5 +1,5 @@ // -// HQBaseNavigationController.h +// XJBaseNavigationController.h // healthQuestion // // Created by xulei on 2022/8/12. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface HQBaseNavigationController : UINavigationController +@interface XJBaseNavigationController : UINavigationController /*! * 返回到指定的类视图 diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.m b/XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.m similarity index 97% rename from XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.m rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.m index 2dd1432..d65acc6 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.m +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.m @@ -1,15 +1,15 @@ // -// HQBaseNavigationController.m +// XJBaseNavigationController.m // healthQuestion // // Created by xulei on 2022/8/12. // -#import "HQBaseNavigationController.h" +#import "XJBaseNavigationController.h" #import "XYTransitionProtocol.h" #import "XYTransition.h" -@interface HQBaseNavigationController () +@interface XJBaseNavigationController () @property (nonatomic, weak) id popDelegate; @property (nonatomic,strong) UIPercentDrivenInteractiveTransition *interactivePopTransition; @@ -18,7 +18,7 @@ @end -@implementation HQBaseNavigationController +@implementation XJBaseNavigationController //APP生命周期中 只会执行一次 + (void)initialize @@ -124,8 +124,8 @@ -(void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated{ - if ([viewController isKindOfClass:[HQBaseViewController class]]) { - HQBaseViewController * vc = (HQBaseViewController *)viewController; + if ([viewController isKindOfClass:[XJBaseViewController class]]) { + XJBaseViewController * vc = (XJBaseViewController *)viewController; if (vc.isHidenNaviBar) { vc.view.top = 0; [vc.navigationController setNavigationBarHidden:YES animated:animated]; diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.h b/XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.h similarity index 81% rename from XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.h rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.h index 2ee7729..3c8ccb8 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.h +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.h @@ -1,5 +1,5 @@ // -// HQBaseTabBarController.h +// XJBaseTabBarController.h // healthQuestion // // Created by xulei on 2022/8/12. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface HQBaseTabBarController : UITabBarController +@interface XJBaseTabBarController : UITabBarController /** 设置小红点 diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m b/XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.m similarity index 95% rename from XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.m index d16e6f6..9f2da5c 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.m @@ -1,11 +1,11 @@ // -// HQBaseTabBarController.m +// XJBaseTabBarController.m // healthQuestion // // Created by xulei on 2022/8/12. // -#import "HQBaseTabBarController.h" +#import "XJBaseTabBarController.h" #import "HQTabBar.h" #import "XJMyCenterViewController.h" #import "ChatListViewController.h" @@ -16,7 +16,7 @@ //干预二期 -@interface HQBaseTabBarController () +@interface XJBaseTabBarController () @property (nonatomic,strong) NSMutableArray * VCS;//tabbar root VC @@ -33,7 +33,7 @@ @end -@implementation HQBaseTabBarController +@implementation XJBaseTabBarController - (void)viewDidLoad { @@ -104,7 +104,7 @@ [controller.tabBarItem setTitleTextAttributes:@{NSForegroundColorAttributeName:UIColorHex(#21BEBD),NSFontAttributeName:SYSTEMFONT(10.0f)} forState:UIControlStateSelected]; //包装导航控制器 - HQBaseNavigationController *nav = [[HQBaseNavigationController alloc]initWithRootViewController:controller]; + XJBaseNavigationController *nav = [[XJBaseNavigationController alloc]initWithRootViewController:controller]; [_VCS addObject:nav]; diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.h b/XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.h similarity index 96% rename from XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.h rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.h index a845046..aab074d 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.h @@ -1,5 +1,5 @@ // -// HQBaseViewController.h +// XJBaseViewController.h // healthQuestion // // Created by xulei on 2022/8/11. @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface HQBaseViewController : UIViewController +@interface XJBaseViewController : UIViewController /** * 修改状态栏颜色 diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m b/XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.m similarity index 98% rename from XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.m index 4acc5b3..3c1258e 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.m @@ -5,14 +5,14 @@ // Created by xulei on 2022/8/11. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "XJLoginViewController.h" -@interface HQBaseViewController () +@interface XJBaseViewController () @end -@implementation HQBaseViewController +@implementation XJBaseViewController - (UIStatusBarStyle)preferredStatusBarStyle{ return _StatusBarStyle; diff --git a/XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.h b/XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.h similarity index 81% rename from XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.h rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.h index d9f67a9..66435ed 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.h +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.h @@ -1,5 +1,5 @@ // -// BaseWebViewVC.h +// XJBaseWebViewVC.h // ScarHousekeeper // // Created by 张小万 on 2021/1/21. @@ -25,7 +25,7 @@ typedef enum { - (void)startFunction; @end -@interface BaseWebViewVC : HQBaseViewController +@interface XJBaseWebViewVC : XJBaseViewController @property (nonatomic, strong) NSString *webUrl; @property (nonatomic, strong) NSString *webTitle; diff --git a/XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.m b/XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.m similarity index 97% rename from XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.m rename to XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.m index b393cf6..13efaa6 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.m +++ b/XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.m @@ -1,13 +1,13 @@ // -// BaseWebViewVC.m +// XJBaseWebViewVC.m // ScarHousekeeper // // Created by 张小万 on 2021/1/21. // -#import "BaseWebViewVC.h" +#import "XJBaseWebViewVC.h" -@interface BaseWebViewVC () +@interface XJBaseWebViewVC () @property (nonatomic, strong)NSURL *originalUrl; @property (nonatomic, copy)NSString *videoUrl; @@ -16,7 +16,7 @@ @end -@implementation BaseWebViewVC +@implementation XJBaseWebViewVC #pragma mark - LifeCycle diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h index a7c309a..e362a1f 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h @@ -36,6 +36,9 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString * title; @property (nonatomic, assign) CGFloat systemHeight; @property (nonatomic, assign) MessageType msgType; +//地图 +@property (nonatomic, assign) CGFloat Longitude; +@property (nonatomic, assign) CGFloat Latitude; @end diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h index ca8517e..89b9291 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface CustomTUIBaseMessageController : HQBaseViewController +@interface CustomTUIBaseMessageController : XJBaseViewController @property(nonatomic, strong) NSString * groupID; diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m index c89a14d..b9c94ce 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m @@ -84,7 +84,7 @@ [parmDic setObject:self.groupID forKey:@"groupId"]; - JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"HISTORYAPI" NeedToken:@""]; + XJPNetAPI * agreeAPI = [[XJPNetAPI alloc] init:self tag:@"HISTORYAPI" NeedToken:@""]; [agreeAPI GetAllHistoryChatRecord:nil]; diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h index 2ab9adf..bea9980 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h @@ -8,10 +8,12 @@ #import #import #import "CustomMapMessageCellData.h" +#import "CustomTUIHistoryModel.h" @interface CustomMapMessageCell : UITableViewCell +@property (nonatomic, strong) CustomTUIHistoryModel * model; @end diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m index 17437da..87e8388 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m @@ -6,13 +6,19 @@ // #import "CustomMapMessageCell.h" +#import @interface CustomMapMessageCell () @property (nonatomic, strong) UIImageView * heardImage; -@property (nonatomic, strong) UILabel * connetLabel; +@property (nonatomic, strong) UILabel * nickNameLabel; +@property (nonatomic, strong) UILabel * myTextLabel; // 展示文本 + +@property (nonatomic, strong) UIImageView * mapImage; // + +@property (nonatomic, strong) UIView * backView; @end @@ -45,9 +51,10 @@ - (void)createUI { self.heardImage = [[UIImageView alloc] init]; - self.heardImage.backgroundColor = KRedColor; + self.heardImage.backgroundColor = KWhiteColor; + self.heardImage.image = [UIImage imageNamed:@"heard_man"]; [self.contentView addSubview:self.heardImage]; - self.heardImage.layer.cornerRadius = 15; + self.heardImage.layer.cornerRadius = 20; self.heardImage.layer.masksToBounds = true; [self.heardImage mas_makeConstraints:^(MASConstraintMaker *make) { @@ -56,20 +63,174 @@ make.height.width.mas_equalTo(@30); }]; - self.connetLabel = [[UILabel alloc] init]; - self.connetLabel.backgroundColor = KRedColor; - [self.contentView addSubview:self.heardImage]; - self.connetLabel.layer.cornerRadius = 10; - self.connetLabel.layer.masksToBounds = true; - self.connetLabel.numberOfLines = 0; - [self.connetLabel mas_makeConstraints:^(MASConstraintMaker *make) { + self.nickNameLabel = [[UILabel alloc] init]; + self.nickNameLabel.text = @"全科医生"; + [self.contentView addSubview:self.nickNameLabel]; + self.nickNameLabel.font = SYSTEMFONT(12); + [self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.heardImage.right).offset(8); + make.left.mas_equalTo(self.heardImage.mas_right).offset(10); make.top.mas_equalTo(@10); - make.width.mas_equalTo(@245.0); + make.width.mas_equalTo(@300.0); + make.height.mas_offset(13); }]; - [self.connetLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; + + //姓名 + self.backView = [[UIView alloc] init]; + self.backView.layer.cornerRadius = 10; + self.backView.backgroundColor = KWhiteColor; + [self.contentView addSubview:self.backView]; + + + [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(self.heardImage.mas_right).offset(10); + make.width.mas_offset(245); + make.top.mas_equalTo(self.nickNameLabel.mas_bottom).offset(8); + make.height.mas_offset(170); + }]; + + + self.myTextLabel = [[UILabel alloc] init]; + self.myTextLabel.font = SYSTEMFONT(15); + self.myTextLabel.textColor = CFontColor1; + self.myTextLabel.text = @"我的位置"; + [self.backView addSubview:self.myTextLabel]; + + [self.myTextLabel mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_offset(10); + make.top.mas_offset(0); + make.right.mas_offset(-10); + make.height.mas_offset(25); + }]; + + + self.mapImage = [[UIImageView alloc] init]; + self.mapImage.backgroundColor = KRedColor; + [self.backView addSubview:self.mapImage]; + [self.mapImage mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.right.bottom.mas_offset(0); + make.top.mas_equalTo(self.myTextLabel.mas_bottom); + }]; +} +- (void)setModel:(CustomTUIHistoryModel *)model { + _model = model; + +// self.nickNameLabel.text = _model.fromAccountName; + + if (_model.isSelf == true) { //头像在右 + + [self.heardImage mas_remakeConstraints:^(MASConstraintMaker *make) { + + make.height.width.mas_offset(40); + make.top.mas_equalTo(@10); + make.right.mas_equalTo(self.contentView.mas_right).offset(-10); + + }]; + self.nickNameLabel.textAlignment = NSTextAlignmentRight; + [self.nickNameLabel mas_remakeConstraints:^(MASConstraintMaker *make) { + + make.right.mas_equalTo(self.heardImage.mas_left).offset(-10); + make.top.mas_equalTo(@10); + make.width.mas_equalTo(@245.0); + make.height.mas_offset(13); + }]; + + [self.backView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.nickNameLabel.mas_bottom).offset(8); + make.width.mas_offset(245); + make.right.mas_equalTo(self.heardImage.mas_left).offset(-10); + make.height.mas_equalTo(@170); + }]; + + + }else + { + [self.heardImage mas_remakeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(@15); + make.top.mas_equalTo(@8); + make.height.width.mas_equalTo(@40); + }]; + self.nickNameLabel.textAlignment = NSTextAlignmentLeft; + + [self.nickNameLabel mas_remakeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(self.heardImage.mas_right).offset(10); + make.top.mas_equalTo(@10); + make.width.mas_equalTo(@300.0); + make.height.mas_offset(13); + }]; + + + [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { + + make.left.mas_equalTo(self.heardImage.mas_right).offset(10); + make.width.mas_offset(245); + make.top.mas_equalTo(self.nickNameLabel.mas_bottom).offset(8); + make.height.mas_offset(170); + }]; + + + } + + + [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) { + + make.top.left.right.mas_equalTo(@0); + make.bottom.mas_equalTo(self.backView.mas_bottom).offset(10); + }]; + + + NSString * MapPictureImg = [self mapLocationImage:_model.Longitude Withlation:_model.Latitude]; + + [self.mapImage sd_setImageWithURL:[NSURL URLWithString:MapPictureImg] placeholderImage:nil]; + + NSString * photo = [NSString stringWithFormat:@"%@%@",ResourceAddress,_model.avatar]; + + NSString * str1 = @"\\"; + + photo = [photo stringByReplacingOccurrencesOfString:str1 withString:@"/"]; + + NSString *encodedString3 = CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)photo, (CFStringRef)@"!$&'()*+,-./:;=?@_~%#[]", NULL, kCFStringEncodingUTF8)); + + [self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:PLACEHOLD_IMG]; +} + + +- (NSString *)mapLocationImage:(CGFloat)longLation Withlation:(CGFloat)lation { + // 0: self.longLation,self.lation + //https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png + NSString * staciUrl = @"https://restapi.amap.com/v3/staticmap?key=e9926badd26aaa766d13439c88a83f2d"; + NSString * mapKey = @"e9926badd26aaa766d13439c88a83f2d"; + NSString * loctaionUrl = @"https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png"; + + NSString * needMdString = [NSString stringWithFormat:@"key=%@&location=%f,%f&markers=-1,%@,0:%f,%f&size=700*500&zoom=15124d58f7223ac9738312a8d187a21f2b",mapKey,longLation,lation,loctaionUrl,longLation,lation]; + + + NSString * mapUrl = [NSString stringWithFormat:@"%@&location=%f,%f&markers=-1,%@,0:%f,%f&size=700*500&zoom=15&sig=%@",staciUrl,longLation,lation,loctaionUrl,longLation,lation,[self md5:needMdString]]; + + return mapUrl; + + + +} +//md加密 +- (NSString *)md5:(NSString *)str +{ + const char *cStr = [str UTF8String]; + unsigned char result[16]; + CC_MD5(cStr, strlen(cStr), result); // This is the md5 call + return [NSString stringWithFormat: + @"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", + result[0], result[1], result[2], result[3], + result[4], result[5], result[6], result[7], + result[8], result[9], result[10], result[11], + result[12], result[13], result[14], result[15] + ]; } diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m index 70dbfa8..37862c0 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m @@ -27,11 +27,11 @@ + (NSString *)mapLocationImage:(CGFloat)longLation Withlation:(CGFloat)lation { // 0: self.longLation,self.lation //https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png - NSString * staciUrl = @"https://restapi.amap.com/v3/staticmap?key=9e4aac9a04b8296e9039adce3b472f28"; - NSString * mapKey = @"9e4aac9a04b8296e9039adce3b472f28"; + NSString * staciUrl = @"https://restapi.amap.com/v3/staticmap?key=e9926badd26aaa766d13439c88a83f2d"; + NSString * mapKey = @"e9926badd26aaa766d13439c88a83f2d"; NSString * loctaionUrl = @"https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png"; - NSString * needMdString = [NSString stringWithFormat:@"key=%@&location=%f,%f&markers=-1,%@,0:%f,%f&size=700*500&zoom=154985aa1abb49ce2daa20d032a374eb58",mapKey,longLation,lation,loctaionUrl,longLation,lation]; + NSString * needMdString = [NSString stringWithFormat:@"key=%@&location=%f,%f&markers=-1,%@,0:%f,%f&size=700*500&zoom=15124d58f7223ac9738312a8d187a21f2b",mapKey,longLation,lation,loctaionUrl,longLation,lation]; NSString * mapUrl = [NSString stringWithFormat:@"%@&location=%f,%f&markers=-1,%@,0:%f,%f&size=700*500&zoom=15&sig=%@",staciUrl,longLation,lation,loctaionUrl,longLation,lation,[self md5:needMdString]]; diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h index 8c739a5..424f06f 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJLoginFoundPasswordViewController : HQBaseViewController +@interface XJLoginFoundPasswordViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m index 6ea84d9..24ae4af 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m @@ -139,7 +139,7 @@ [parmDic setObject:self.codeTextFild.text forKey:@"idCard"]; [parmDic setObject:self.phoneTextFild.text forKey:@"phone"]; - JKCQAPI * chageApi = [[JKCQAPI alloc] init:self tag:@"CHANGEAPI" NeedToken:@""]; + XJPNetAPI * chageApi = [[XJPNetAPI alloc] init:self tag:@"CHANGEAPI" NeedToken:@""]; [chageApi postSetUserPassword:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h index 12a4813..913253e 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJLoginSetPasswordViewController : HQBaseViewController +@interface XJLoginSetPasswordViewController : XJBaseViewController @property (nonatomic, copy) NSString * result; diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m index 2d6243e..58f1de6 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m @@ -169,7 +169,7 @@ [parmDic setObject:encryptStr forKey:@"newPasswordConfirm"]; [parmDic setObject:self.result forKey:@"resetCode"]; - JKCQAPI * chageApi = [[JKCQAPI alloc] init:self tag:@"CHANGEAPI" NeedToken:@""]; + XJPNetAPI * chageApi = [[XJPNetAPI alloc] init:self tag:@"CHANGEAPI" NeedToken:@""]; [chageApi postResetUserNewPassword:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.h index acd28c5..561e6c2 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.h @@ -5,11 +5,11 @@ // Created by Apple on 2025/10/31. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJLoginTopChangeViewController : HQBaseViewController +@interface XJLoginTopChangeViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.m index 7f14282..699ab14 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.m @@ -15,6 +15,8 @@ #import "XJRegisterViewController.h" #import "LVKeyboard.h" #import "MQTextField.h" +#import "XJTYFoundPassWordViewController.h" + @interface XJLoginTopChangeViewController () @property (nonatomic, strong) UITextField * userNameField; @@ -45,6 +47,8 @@ @property (nonatomic, assign) NSInteger loginType; +@property (nonatomic, strong) UIButton * foundPasswordBtn; + @end @implementation XJLoginTopChangeViewController @@ -221,10 +225,11 @@ UIButton * foundPasswordBtn = [UIButton buttonWithType:UIButtonTypeCustom]; foundPasswordBtn.frame = CGRectMake(kRealValue(35), loginBtn.bottom + kRealValue(23), WIDTH - kRealValue(70), 20); - [foundPasswordBtn setTitle:@"找回密码" forState:UIControlStateNormal]; + [foundPasswordBtn setTitle:@"统一认证找回密码" forState:UIControlStateNormal]; foundPasswordBtn.titleLabel.font = MEDIUMFONT(14); [foundPasswordBtn setTitleColor:UIColorHex(#B6B6B6) forState:UIControlStateNormal]; [foundPasswordBtn addTarget:self action:@selector(foundUserPasswordAction) forControlEvents:UIControlEventTouchUpInside]; + self.foundPasswordBtn = foundPasswordBtn; [loginView addSubview:foundPasswordBtn]; @@ -341,7 +346,7 @@ } - (void)createData { - JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + XJPNetAPI * agreeAPI = [[XJPNetAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; [agreeAPI getUserAgreementPrivacy:nil]; @@ -355,9 +360,7 @@ [EasyTextView showErrorText:@"请选阅读并同意用户服务协议与隐私"]; return;; } - - - + if (self.userNameField.text.length < 1) { [EasyTextView showErrorText:@"请输入用户名"]; return;; @@ -396,7 +399,7 @@ //统一平台登录 if (self.loginType == 1) { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; [proctocolApi healthAccountLogin:parmDic]; } else //健康系统登录 @@ -425,9 +428,7 @@ return; } - - - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; [proctocolApi PostLogin:parmDic]; } @@ -452,8 +453,19 @@ NSDictionary * dic = response; HQUserInfo * user = [[HQUserInfo alloc] init]; - user.userInfo = [dic objectForKey:@"userInfo"]; - user.token = [dic objectForKey:@"token"]; + id (^safeValue)(id obj) = ^id(id obj) { + return (obj && ![obj isKindOfClass:[NSNull class]]) ? obj : nil; + }; + + NSDictionary *userInfo = safeValue(dic[@"userInfo"]); + if ([userInfo isKindOfClass:[NSDictionary class]]) { + user.userInfo = userInfo; + } + + NSString *token = safeValue(dic[@"token"]); + if ([token isKindOfClass:[NSString class]]) { + user.token = token; + } [HQCommonUtils keyedArchiverWithData:user key:LoginUserInfo]; [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"LOGINAgree"]; [[NSUserDefaults standardUserDefaults] synchronize]; @@ -558,7 +570,7 @@ - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; @@ -584,15 +596,25 @@ - (void)foundUserPasswordAction { // GastoremteroscopeViewController * resultAppointVC = [[GastoremteroscopeViewController alloc] init]; // [self.navigationController pushViewController:resultAppointVC animated:YES]; - XJLoginFoundPasswordViewController * foundVC = [[XJLoginFoundPasswordViewController alloc] init]; - - [self.navigationController pushViewController:foundVC animated:YES]; + + if (self.loginType == 1) { //统一平台找回密码 + + XJTYFoundPassWordViewController * xjVC = [[XJTYFoundPassWordViewController alloc] init]; + xjVC.webUrl = @"https://sso.iosp.ydpt.tech/SSOManageClient/userController/changePassword"; + [self.navigationController pushViewController:xjVC animated:YES]; + + }else + { + XJLoginFoundPasswordViewController * foundVC = [[XJLoginFoundPasswordViewController alloc] init]; + + [self.navigationController pushViewController:foundVC animated:YES]; + } } - (void)ishiderRegisData { - JKCQAPI * versionAPI = [[JKCQAPI alloc] init:self tag:@"VERSIONAPI" NeedToken:@""]; + XJPNetAPI * versionAPI = [[XJPNetAPI alloc] init:self tag:@"VERSIONAPI" NeedToken:@""]; [versionAPI getVesionHideRegis:@{@"type":@"app_update_user_ios"}.mutableCopy]; @@ -641,6 +663,8 @@ self.loginType = 1; self.leftLoginBtn.selected = true; self.rightLoginBtn.selected = false; + [self.foundPasswordBtn setTitle:@"统一认证找回密码" forState:UIControlStateNormal]; + } //健康系统登录方法 @@ -648,6 +672,8 @@ self.loginType = 2; self.leftLoginBtn.selected = false; self.rightLoginBtn.selected = true; + [self.foundPasswordBtn setTitle:@"健康系统找回密码" forState:UIControlStateNormal]; + diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h index ea06b76..208de69 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h @@ -5,11 +5,11 @@ // Created by xulei on 2022/8/16. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJLoginViewController : HQBaseViewController +@interface XJLoginViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m index e039e52..21946a4 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m @@ -15,6 +15,8 @@ #import "XJRegisterViewController.h" #import "LVKeyboard.h" #import "MQTextField.h" +#import "XJTYFoundPassWordViewController.h" + @interface XJLoginViewController () @property (nonatomic, strong) UITextField * userNameField; @@ -285,7 +287,7 @@ } - (void)createData { - JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + XJPNetAPI * agreeAPI = [[XJPNetAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; [agreeAPI getUserAgreementPrivacy:nil]; @@ -360,7 +362,7 @@ [parmDic setObject:encryptStr forKey:@"password"]; - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; [proctocolApi PostLogin:parmDic]; // @@ -502,7 +504,7 @@ - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; @@ -536,7 +538,7 @@ - (void)ishiderRegisData { - JKCQAPI * versionAPI = [[JKCQAPI alloc] init:self tag:@"VERSIONAPI" NeedToken:@""]; + XJPNetAPI * versionAPI = [[XJPNetAPI alloc] init:self tag:@"VERSIONAPI" NeedToken:@""]; [versionAPI getVesionHideRegis:@{@"type":@"app_update_user_ios"}.mutableCopy]; diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.h new file mode 100644 index 0000000..41df0ef --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.h @@ -0,0 +1,16 @@ +// +// XJTYFoundPassWordViewController.h +// XinjiangProject +// +// Created by Apple on 2025/11/21. +// + +#import "XJBaseWebViewVC.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJTYFoundPassWordViewController : XJBaseWebViewVC + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m b/XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.m similarity index 66% rename from XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m rename to XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.m index 13814f2..64c6a8c 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.m @@ -1,21 +1,23 @@ // -// DownPDFFileVC.m +// XJTYFoundPassWordViewController.m // XinjiangProject // -// Created by 仁康信息 on 2023/12/1. +// Created by Apple on 2025/11/21. // -#import "DownPDFFileVC.h" +#import "XJTYFoundPassWordViewController.h" -@interface DownPDFFileVC () +@interface XJTYFoundPassWordViewController () @end -@implementation DownPDFFileVC +@implementation XJTYFoundPassWordViewController - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. + + self.isHidenNaviBar = false; } /* diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h index c661942..c1710db 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h @@ -5,11 +5,11 @@ // Created by xulei on 2022/8/17. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJRegisterViewController : HQBaseViewController +@interface XJRegisterViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m index bf82a93..6ddc912 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m @@ -116,7 +116,7 @@ #pragma mark - 获取协议 - (void)getUserProtocol { - JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + XJPNetAPI * agreeAPI = [[XJPNetAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; [agreeAPI getUserAgreementPrivacy:nil]; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h index 09e27dd..bf81f97 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h @@ -5,12 +5,12 @@ // Created by 仁康信息 on 2023/7/27. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "XJEmergencyContactModel.h" NS_ASSUME_NONNULL_BEGIN -@interface XJAddContactViewController : HQBaseViewController +@interface XJAddContactViewController : XJBaseViewController @property (nonatomic, copy) NSString * contact_id; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m index abd4e97..8a5f6f6 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m @@ -184,7 +184,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:self.model.contact_ID forKey:@"id"]; - JKCQAPI * memberApi = [[JKCQAPI alloc] init:self tag:@"DelectedAPI" NeedToken:@""]; + XJPNetAPI * memberApi = [[XJPNetAPI alloc] init:self tag:@"DelectedAPI" NeedToken:@""]; [memberApi getDelectedEmergencyContact:parmDic]; } @@ -192,7 +192,7 @@ - (void)getFamilyMembers { - JKCQAPI * memberApi = [[JKCQAPI alloc] init:self tag:@"Family" NeedToken:@""]; + XJPNetAPI * memberApi = [[XJPNetAPI alloc] init:self tag:@"Family" NeedToken:@""]; [memberApi getCheckKeyResult:@{@"dictKey":@"family_member_relation"}]; @@ -307,7 +307,7 @@ [parmDic setObject:self.cardNumberField.text forKey:@"idCard"]; [parmDic setObject:self.familyInt forKey:@"familyRelation"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; [api postAddEmergencyContact:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h index cd18740..c16f8f0 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2024/1/10. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJEditSystemViewController : HQBaseViewController +@interface XJEditSystemViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m index 4af9999..e369cb5 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m @@ -56,7 +56,7 @@ - (void)createData { - JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + XJPNetAPI * agreeAPI = [[XJPNetAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; [agreeAPI getUserAgreementPrivacy:nil]; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h index 937610d..1f65eec 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h @@ -5,11 +5,11 @@ // Created by Apple on 2025/7/3. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJEmergencyListViewController : HQBaseViewController +@interface XJEmergencyListViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m index 6a391dd..1a20892 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m @@ -111,7 +111,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; - JKCQAPI * numbeApi = [[JKCQAPI alloc] init:self tag:@"ContactAPI" NeedToken:@""]; + XJPNetAPI * numbeApi = [[XJPNetAPI alloc] init:self tag:@"ContactAPI" NeedToken:@""]; [numbeApi getEmergencyContact:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h index 31f04e4..836201c 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/25. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJMinePictureRecordViewController : HQBaseViewController +@interface XJMinePictureRecordViewController : XJBaseViewController @property (nonatomic, assign) NSInteger selectOnes; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m index 9e2c0b8..6495087 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m @@ -311,7 +311,7 @@ [parmDic setObject:array forKey:@"imIds"]; [self showMBProgressHUDWithString:@"数据加载中，请稍候..." autoHidden:NO]; - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; [recordApi PostGroupIDArray:parmDic]; } @@ -325,14 +325,14 @@ [parmDic setObject:self.type forKey:@"status"]; [parmDic setObject:@"1" forKey:@"type"]; //status 1 3 4 5 //4 代评价 - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi getMineQuestionRecord:parmDic]; } - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h index cd1fc4d..2b1951f 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/25. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJMineQuestionRecordViewController : HQBaseViewController +@interface XJMineQuestionRecordViewController : XJBaseViewController @property (nonatomic, assign) NSInteger type; // 1 进行中 2 待评价 3 已评价 4 历史 @property (nonatomic, assign) NSInteger titleSelected; // 10 图文 11 音视频 diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h index e83ba85..c13d6a0 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/26. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJMineUserInfoViewController : HQBaseViewController +@interface XJMineUserInfoViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m index 4e57bdf..2b513fe 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m @@ -70,7 +70,7 @@ - (void)createData { - JKCQAPI * infoApi = [[JKCQAPI alloc] init:self tag:@"USERINFO" NeedToken:@""]; + XJPNetAPI * infoApi = [[XJPNetAPI alloc] init:self tag:@"USERINFO" NeedToken:@""]; [infoApi getMineCenterUserInfo:nil]; @@ -82,7 +82,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; - JKCQAPI * numbeApi = [[JKCQAPI alloc] init:self tag:@"ContactAPI" NeedToken:@""]; + XJPNetAPI * numbeApi = [[XJPNetAPI alloc] init:self tag:@"ContactAPI" NeedToken:@""]; [numbeApi getEmergencyContact:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h index 341bda0..79a2a32 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/25. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJMineVideoRecordViewController : HQBaseViewController +@interface XJMineVideoRecordViewController : XJBaseViewController @property (nonatomic, assign) NSInteger selectOnes; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m index cad3f4f..0cffa87 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m @@ -211,7 +211,7 @@ [parmDic setObject:self.type forKey:@"status"]; [parmDic setObject:@"2" forKey:@"type"]; //status 1 3 4 5 //4 代评价 - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi getMineQuestionRecord:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h index 0a406f9..bb8a1cf 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/2/13. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJMyCenterViewController : HQBaseViewController +@interface XJMyCenterViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m index 34685ee..bc19a2b 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m @@ -124,7 +124,7 @@ - (void)createUserInfo { [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:NO]; - JKCQAPI * infoApi = [[JKCQAPI alloc] init:self tag:@"USERINFO" NeedToken:@""]; + XJPNetAPI * infoApi = [[XJPNetAPI alloc] init:self tag:@"USERINFO" NeedToken:@""]; [infoApi getMineCenterUserInfo:nil]; } @@ -223,7 +223,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; - JKCQAPI * numbeApi = [[JKCQAPI alloc] init:self tag:@"NUMBERAPI" NeedToken:@""]; + XJPNetAPI * numbeApi = [[XJPNetAPI alloc] init:self tag:@"NUMBERAPI" NeedToken:@""]; [numbeApi getMineCenterNumber:dic]; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h index ed20939..dc780a5 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/8/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJSOSDetailInfoViewController : HQBaseViewController +@interface XJSOSDetailInfoViewController : XJBaseViewController @property (nonatomic, copy) NSString * sessionId; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m index 54ed2bf..6dee3f6 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m @@ -39,7 +39,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setValue:self.sessionId forKey:@"id"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; [detailApi getSOSDoctorDetailInfo:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h index 2c2e55a..e20d4bc 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/8/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJSOSDetailSmallSumViewController : HQBaseViewController +@interface XJSOSDetailSmallSumViewController : XJBaseViewController @property (nonatomic, copy) NSString * hospital_id; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m index c99ce26..cc0cf49 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m @@ -96,7 +96,7 @@ [parmDic setObject:self.hospital_id forKey:@"id"]; - JKCQAPI * smallApi = [[JKCQAPI alloc] init:self tag:@"SMALLAPI" NeedToken:@""]; + XJPNetAPI * smallApi = [[XJPNetAPI alloc] init:self tag:@"SMALLAPI" NeedToken:@""]; [smallApi getSOSSmallSumData:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h index 112a7c0..37b032d 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/8/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJSOSLookDoctorDetailViewController : HQBaseViewController +@interface XJSOSLookDoctorDetailViewController : XJBaseViewController @property (nonatomic, copy) NSString * sessionId; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h index 91299fe..d0af994 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/8/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJSOSLookDoctoreViewController : HQBaseViewController +@interface XJSOSLookDoctoreViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m index 4c3da9a..8e93ded 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m @@ -89,7 +89,7 @@ [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@"20" forKey:@"pageSize"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"STATUSING" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"STATUSING" NeedToken:@""]; [api getSOSDoctorRecordList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h index e1ddfb2..d4c3bed 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/12/14. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface MonitoringWarchViewController : HQBaseViewController +@interface MonitoringWarchViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m index 0f686d6..7552c62 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m @@ -8,12 +8,10 @@ #import "MonitoringWarchViewController.h" #import "MonitoringWatchTableView.h" #import "ADJumpViewController.h" -#import "SDGETHealthTokenManager.h" -#import "SDHttpRequest.h" #import "MonitoringDataModel.h" #import "BRStringPickerView.h" -#import "MonitoringDetailViewController.h" -#import "MonitoringHistoryController.h" +#import "XJMonitoringDetailViewController.h" +#import "XJMonitoringHistoryController.h" @interface MonitoringWarchViewController () @@ -110,7 +108,7 @@ }; self.homeTable.historyBlock = ^(NSString *type) { - MonitoringHistoryController * historyVC = [[MonitoringHistoryController alloc] init]; + XJMonitoringHistoryController * historyVC = [[XJMonitoringHistoryController alloc] init]; historyVC.eventType = type; [self.navigationController pushViewController:historyVC animated:YES]; @@ -198,7 +196,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:@"2" forKey:@"type"]; - JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"QUSTIONAPI" NeedToken:@""]; + XJPNetAPI * sosApi = [[XJPNetAPI alloc] init:self tag:@"QUSTIONAPI" NeedToken:@""]; [sosApi getMinitringFillQusetion:parmDic]; } @@ -209,7 +207,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:User_ID forKey:@"userId"]; - JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; + XJPNetAPI * sosApi = [[XJPNetAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; [sosApi getMinitringWatchData:parmDic]; } @@ -402,7 +400,7 @@ [parmDic setObject:min forKey:@"warnMin"]; [self showMBProgressHUDWithString:@"请稍候..." autoHidden:false]; - JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"MAXAPI" NeedToken:@""]; + XJPNetAPI * sosApi = [[XJPNetAPI alloc] init:self tag:@"MAXAPI" NeedToken:@""]; [sosApi getInterMonitoringMaxMinData:parmDic]; } @@ -410,7 +408,7 @@ - (void)lookDetailType:(NSString *)type withTime:(NSString *)time{ - MonitoringDetailViewController *detailVC = [[MonitoringDetailViewController alloc] init]; + XJMonitoringDetailViewController *detailVC = [[XJMonitoringDetailViewController alloc] init]; if ([type isEqualToString:@"heart_rate"]) { diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.h similarity index 57% rename from XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h rename to XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.h index 2d09cb7..0780f7c 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.h @@ -1,15 +1,15 @@ // -// MonitoringDetailViewController.h +// XJMonitoringDetailViewController.h // XinjiangProject // // Created by Apple on 2025/7/1. // -#import "BaseWebViewVC.h" +#import "XJBaseWebViewVC.h" NS_ASSUME_NONNULL_BEGIN -@interface MonitoringDetailViewController : BaseWebViewVC +@interface XJMonitoringDetailViewController : XJBaseWebViewVC @property (nonatomic, strong) NSString * navTitle; diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.m similarity index 96% rename from XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m rename to XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.m index 5137636..f3bc9b4 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.m @@ -1,17 +1,17 @@ // -// MonitoringDetailViewController.m +// XJMonitoringDetailViewController.m // XinjiangProject // // Created by Apple on 2025/7/1. // -#import "MonitoringDetailViewController.h" +#import "XJMonitoringDetailViewController.h" -@interface MonitoringDetailViewController () +@interface XJMonitoringDetailViewController () @end -@implementation MonitoringDetailViewController +@implementation XJMonitoringDetailViewController - (void)viewDidLoad { [super viewDidLoad]; @@ -99,7 +99,7 @@ [self.navigationController.navigationBar setTitleTextAttributes:titleAttributes]; } - UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[HQBaseNavigationController class]]]; + UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[XJBaseNavigationController class]]]; //设置导航条字体颜色和大小 // self.navigationController.navigationBar NSDictionary *dict = [NSDictionary dictionary]; diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.h similarity index 56% rename from XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h rename to XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.h index eb2781c..7d5bef7 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.h @@ -1,15 +1,15 @@ // -// MonitoringHistoryController.h +// XJMonitoringHistoryController.h // XinjiangProject // // Created by Apple on 2025/7/1. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface MonitoringHistoryController : HQBaseViewController +@interface XJMonitoringHistoryController : XJBaseViewController @property (nonatomic, strong) NSString * eventType; diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.m similarity index 97% rename from XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m rename to XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.m index a04d64d..4e10561 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.m @@ -1,15 +1,15 @@ // -// MonitoringHistoryController.m +// XJMonitoringHistoryController.m // XinjiangProject // // Created by Apple on 2025/7/1. // -#import "MonitoringHistoryController.h" +#import "XJMonitoringHistoryController.h" #import "MonitoringHistoryTableView.h" #import "MonitoringDataModel.h" -@interface MonitoringHistoryController () +@interface XJMonitoringHistoryController () @property (nonatomic, strong) UILabel *weekLabel; @property (nonatomic, strong) NSDate *currentDate; // 当前日期 @@ -23,7 +23,7 @@ @end -@implementation MonitoringHistoryController +@implementation XJMonitoringHistoryController - (NSMutableArray *)dataArray { @@ -224,7 +224,7 @@ [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@"20" forKey:@"pageSize"]; - JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"HISTORYAPI" NeedToken:@""]; + XJPNetAPI * sosApi = [[XJPNetAPI alloc] init:self tag:@"HISTORYAPI" NeedToken:@""]; [sosApi getWranHistoryList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h index e6dae8f..8be39ab 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/14. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface HospitalIntroViewController : HQBaseViewController +@interface HospitalIntroViewController : XJBaseViewController @property (nonatomic, strong) NSString * hospitalID; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m index 86454a8..5465474 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m @@ -179,7 +179,7 @@ [parmDic setObject:self.hospitalID forKey:@"id"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; [detailApi getHospatilDetail:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h index 90e6396..1609322 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/1. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface HospitalJianjieViewController : HQBaseViewController +@interface HospitalJianjieViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h index 965e354..be403e1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/9. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface HospitalMainViewController : HQBaseViewController +@interface HospitalMainViewController : XJBaseViewController @property (nonatomic, strong) NSString * hospitalID; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m index ed207e6..38004f1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m @@ -247,7 +247,7 @@ [parmDic setObject:self.hospitalID forKey:@"id"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; [detailApi getHospatilDetail:parmDic]; @@ -260,7 +260,7 @@ [parmDic setObject:@"1" forKey:@"pageNo"]; [parmDic setObject:@"6" forKey:@"pageSize"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"ROOMSAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"ROOMSAPI" NeedToken:@""]; [detailApi getHospatilDetailRoomsDoctor:parmDic]; } @@ -274,7 +274,7 @@ [parmDic setObject:@"1" forKey:@"pageNo"]; [parmDic setObject:@"3" forKey:@"pageSize"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"EVALUATAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"EVALUATAPI" NeedToken:@""]; [detailApi getHospatilEvaluate:parmDic]; @@ -448,7 +448,7 @@ [parmDic setObject:@"1" forKey:@"pageNo"]; [parmDic setObject:@"3" forKey:@"pageSize"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; [detailApi getCancelCollectHospatil:parmDic]; @@ -458,7 +458,7 @@ [parmDic setObject:self.hospitalID forKey:@"hospitalId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; [detailApi getCollectHospatil:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h index 03b9f09..9fbfc9d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h @@ -5,12 +5,12 @@ // Created by 仁康信息 on 2023/6/27. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "QuestionDiseaseInfoModel.h" NS_ASSUME_NONNULL_BEGIN -@interface LookModficalFileViewController : HQBaseViewController +@interface LookModficalFileViewController : XJBaseViewController @property (nonatomic, strong) QuestionDiseaseInfoModel * infomodel; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m index 20828b7..88b62f3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m @@ -545,7 +545,7 @@ [parmDic setObject:self.disModel.tfper_id forKey:@"id"]; } - JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; + XJPNetAPI * upApi = [[XJPNetAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; [upApi GetLookModficalMemberShipFileData:parmDic]; @@ -606,7 +606,7 @@ [parmDic setObject:self.downID forKey:@"medicalRecordsId"]; if (self.questionType == 1) { [self showMBProgressHUDWithString:@"等待发起会话" autoHidden:NO]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; [questionApi postPictureQuestionAPI:parmDic]; } @@ -618,7 +618,7 @@ [parmDic setObject:@"2" forKey:@"contentType"]; [parmDic setObject:self.schedulingDateId forKey:@"schedulingDateId"]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"VIDEO" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"VIDEO" NeedToken:@""]; [questionApi postVideoQuestionAPI:parmDic]; } } @@ -687,7 +687,7 @@ - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } @@ -769,7 +769,7 @@ [self showMBProgressHUDWithString:@"档案上传中,请稍候..." autoHidden:NO]; - JKCQAPI * addApi = [[JKCQAPI alloc] init:self tag:@"ADDFILE" NeedToken:@""]; + XJPNetAPI * addApi = [[XJPNetAPI alloc] init:self tag:@"ADDFILE" NeedToken:@""]; [addApi PostMemberShipFileData:parmDic]; @@ -788,7 +788,7 @@ if (self.questionType == 1) { self.isJump = 2; [self showMBProgressHUDWithString:@"等待发起会话" autoHidden:NO]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; [questionApi postPictureQuestionAPI:parmDic]; } @@ -800,7 +800,7 @@ [parmDic setObject:@"2" forKey:@"contentType"]; [parmDic setObject:self.schedulingDateId forKey:@"schedulingDateId"]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"VIDEO" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"VIDEO" NeedToken:@""]; [questionApi postVideoQuestionAPI:parmDic]; } }else //确认提交 @@ -848,7 +848,7 @@ [self.againSelectPhoto removeAllObjects]; - JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"UPLOADAPI" NeedToken:@""]; + XJPNetAPI * upApi = [[XJPNetAPI alloc] init:self tag:@"UPLOADAPI" NeedToken:@""]; for (int i = 0; i < self.selectedPhotos.count; i ++ ) { if ([self.selectedPhotos[i] isKindOfClass:[NSString class]]) { @@ -906,7 +906,7 @@ if (self.selectedPhotos.count > 0) { - JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"saveAPI" NeedToken:@""]; + XJPNetAPI * upApi = [[XJPNetAPI alloc] init:self tag:@"saveAPI" NeedToken:@""]; [self.imageUrlArray removeAllObjects]; for (int i = 0; i < self.selectedPhotos.count; i ++ ) { @@ -1014,7 +1014,7 @@ [self showMBProgressHUDWithString:@"更新档案中,请稍候..." autoHidden:NO]; - JKCQAPI * addApi = [[JKCQAPI alloc] init:self tag:@"ageinADDFILE" NeedToken:@""]; + XJPNetAPI * addApi = [[XJPNetAPI alloc] init:self tag:@"ageinADDFILE" NeedToken:@""]; [addApi PostMemberShipFileData:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h index 8f73b0e..f97a05a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/18. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface QuesstionDetailLookFileViewController : HQBaseViewController +@interface QuesstionDetailLookFileViewController : XJBaseViewController @property (nonatomic, copy) NSString * danganID; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m index 16ab094..640bed7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m @@ -381,7 +381,7 @@ [parmDic setObject:self.danganID forKey:@"id"]; } - JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; + XJPNetAPI * upApi = [[XJPNetAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; [upApi GetLookQuestionDetailFileData:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h index e6396b6..9468e26 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/13. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface QuestionMustKnowViewController : HQBaseViewController +@interface QuestionMustKnowViewController : XJBaseViewController @property (nonatomic, assign) NSInteger popType; //1 图文 0 音视频 2 用户须知 @property (nonatomic, strong) NSString * doctorId; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m index 7ec5e28..d0d8a69 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m @@ -116,7 +116,7 @@ // 1 图文 0 音视频 2 用户须知 [parmDic setObject:[NSString stringWithFormat:@"%d",self.popType] forKey:@"type"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"MEMBERAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"MEMBERAPI" NeedToken:@""]; [detailApi getFoundPopConnetResult :parmDic]; @@ -239,7 +239,7 @@ [parmDic setObject:self.showID forKey:@"id"]; [parmDic setObject:notShow forKey:@"notShow"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"NOTSHOW" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"NOTSHOW" NeedToken:@""]; [api getSelectedShow:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h index d452b55..32919b6 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/14. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface QuestionPeopleMangerVC : HQBaseViewController +@interface QuestionPeopleMangerVC : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m index 40ae40c..16ede7c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m @@ -142,7 +142,7 @@ [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * userApi = [[JKCQAPI alloc] init:self tag:@"QUSTION" NeedToken:@""]; + XJPNetAPI * userApi = [[XJPNetAPI alloc] init:self tag:@"QUSTION" NeedToken:@""]; [userApi getQuestionManagerList:parmDic]; @@ -222,7 +222,7 @@ [parmDic setObject:seleArray forKey:@"param"]; - JKCQAPI * userApi = [[JKCQAPI alloc] init:self tag:@"DELECT" NeedToken:@""]; + XJPNetAPI * userApi = [[XJPNetAPI alloc] init:self tag:@"DELECT" NeedToken:@""]; [userApi delectedQuestionManagerList:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h index 3fa698f..042cc92 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/13. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface QuestionViewController : HQBaseViewController +@interface QuestionViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m index 7aba4e8..ec1ed56 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m @@ -115,7 +115,7 @@ { [parmDic setObject:user.token forKey:@"token"]; } - JKCQAPI * homeRemakerApi = [[JKCQAPI alloc] init:self tag:@"verifyToken" NeedToken:@""]; + XJPNetAPI * homeRemakerApi = [[XJPNetAPI alloc] init:self tag:@"verifyToken" NeedToken:@""]; [homeRemakerApi GetverifyToken:parmDic]; @@ -338,12 +338,10 @@ if (self.homeTable) { - [self chageUrlService]; }else { [self verifyTokenData]; - [self chageUrlService]; } } @@ -356,7 +354,7 @@ [parmDic setObject:@(1) forKey:@"pageNo"]; [parmDic setObject:@(3) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"RECOMMEND" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"RECOMMEND" NeedToken:@""]; [searchApi GetQuetsionRecordsList:parmDic]; } @@ -372,104 +370,6 @@ } -#pragma mark:请求前缀 -- (void)chageUrlService { - - AFHTTPSessionManager *session=[AFHTTPSessionManager manager]; - // AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager]; - - session.responseSerializer.acceptableContentTypes=[NSSet setWithObjects:@"application/json",@"text/json",@"text/javascript",@"text/html",@"text/plain", nil]; - //超时时间 - - session.requestSerializer.timeoutInterval= 30.f; - session.responseSerializer = [AFHTTPResponseSerializer serializer]; - - session.requestSerializer = [AFJSONRequestSerializer serializer]; - - session.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone]; - - NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - - - // 获取应用的版本号 - NSString * version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; - // 将版本号按照点（.）分割成数组 - NSArray * components = [version componentsSeparatedByString:@"."]; - - // 获取数组中的最后一个元素 - NSString * lastComponent = [components lastObject]; - // 如果需要将其转换为整数 - NSInteger lastNumber = [lastComponent integerValue]; - [parmDic setObject:@(lastNumber) forKey:@"version"]; - [parmDic setObject:@"com.question.QinghaiProvince" forKey:@"pkg"]; - [session GET:@"https://base.icdat.cn/v2/url" parameters:parmDic headers:@{@"X-ClientSign":@"Quarry"} progress:^(NSProgress * _Nonnull downloadProgress) { - - } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) { - - NSString * dataString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding]; - DLog(@"response\n%@\n",dataString); - NSData *requestData = [dataString dataUsingEncoding:NSUTF8StringEncoding]; - - id myResult = [NSJSONSerialization JSONObjectWithData:requestData options:NSJSONReadingMutableContainers error:nil]; - //判断是否为字典 - if ([myResult isKindOfClass:[NSDictionary class]]) { - - NSDictionary *response = (NSDictionary *)myResult; - if ([response.allKeys containsObject:@"result"]) { - NSDictionary * resultDic = [response objectForKey:@"result"]; - - if ([resultDic.allKeys containsObject:@"api"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"api"] forKey:@"HTTPS"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - NSString * apiString = [resultDic objectForKey:@"api"]; - //判断是否正在审 - BOOL isExmine; - if ([apiString containsString:@"api.out.icdat.cn"]) { //正在审 - isExmine = true; - }else - { - isExmine = false; - } - [[NSUserDefaults standardUserDefaults] setObject:@(isExmine) forKey:@"isExmine"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - //版本升级 - //没在审 升级 - if (isExmine == false) { - [self getUpDateinfo]; - } - } - - if ([resultDic.allKeys containsObject:@"h5"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"h5"] forKey:@"IntervenH5"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - if ([resultDic.allKeys containsObject:@"h5Host"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"h5Host"] forKey:@"H5DevHost"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - if ([resultDic.allKeys containsObject:@"health"]) { - [[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"health"] forKey:@"BASEURL"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - } - - [self verifyTokenData]; - - } - } - - } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { - //请求超时 - [[NSUserDefaults standardUserDefaults] setObject:@"https://xjapi.icdat.cn" forKey:@"HTTPS"]; - [[NSUserDefaults standardUserDefaults] setObject:@"https://yyjk.cqygjk.com/" forKey:@"BASEURL"]; - [[NSUserDefaults standardUserDefaults] setObject:@"xjconsole.icdat.cn/" forKey:@"IntervenH5"]; - [[NSUserDefaults standardUserDefaults] setObject:@"https://api.xjygjk.com" forKey:@"H5DevHost"]; - [[NSUserDefaults standardUserDefaults] synchronize]; - - }]; - -} - - (void)Sucess:(id)response tag:(NSString*)tag { @@ -694,7 +594,7 @@ #pragma mark:小助手的回调 - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } @@ -702,7 +602,7 @@ - (void)loginImAccountList { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMList" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"loginIMList" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } @@ -739,7 +639,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [self showMBProgressHUDWithString:@"咨询中,请稍候..." autoHidden:NO]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"SMALLHELP" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"SMALLHELP" NeedToken:@""]; [searchApi postSmallHelpGroup:dic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h index e9d2944..20be7e2 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/28. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJAudioVideoRecordViewController : HQBaseViewController +@interface XJAudioVideoRecordViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m index e2194d8..61a2d27 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m @@ -147,7 +147,7 @@ [parmDic setObject: self.type forKey:@"status"]; [parmDic setObject:@"2" forKey:@"type"]; - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi GetQuestionRecordList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h index 2b71679..076d904 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/28. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJPictureRecordViewController : HQBaseViewController +@interface XJPictureRecordViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m index ec77f50..c57a3ac 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m @@ -292,7 +292,7 @@ [parmDic setObject:array forKey:@"imIds"]; [self showMBProgressHUDWithString:@"加载中,请稍候..." autoHidden:false]; - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; [recordApi PostGroupIDArray:parmDic]; } @@ -306,7 +306,7 @@ [parmDic setObject:self.type forKey:@"status"]; [parmDic setObject:@"1" forKey:@"type"]; //status 1 3 4 5 //4 代评价 - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi GetQuestionRecordList:parmDic]; //getMineQuestionRecord } @@ -314,7 +314,7 @@ - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h index 83a0dca..3d44ce5 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/28. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJQuestionCompleteViewController : HQBaseViewController +@interface XJQuestionCompleteViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m index 2a2854f..a3cbc65 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m @@ -120,7 +120,7 @@ [parmDic setObject:@"5" forKey:@"status"]; [parmDic setObject:self.type forKey:@"type"]; - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi GetQuestionRecordList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h index ed49781..795d12d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/28. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJQuestionJingxingViewController : HQBaseViewController +@interface XJQuestionJingxingViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m index 17e6179..4c74aa7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m @@ -120,7 +120,7 @@ [parmDic setObject:@"3" forKey:@"status"]; [parmDic setObject:self.type forKey:@"type"]; - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi GetQuestionRecordList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h index 7bf0e2a..93e3067 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/28. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJQustionRecordViewController : HQBaseViewController +@interface XJQustionRecordViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h index 0cc201a..4c800c9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/28. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJQustionWaitEvlaViewController : HQBaseViewController +@interface XJQustionWaitEvlaViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m index 0a5df37..a62815d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m @@ -120,7 +120,7 @@ [parmDic setObject:@"4" forKey:@"status"]; [parmDic setObject:self.type forKey:@"type"]; - JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + XJPNetAPI * recordApi = [[XJPNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; [recordApi GetQuestionRecordList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.h index 35996e7..8f4e047 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.h @@ -5,11 +5,11 @@ // Created by Apple on 2024/7/5. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface RoomDoctorRecordsVC : HQBaseViewController +@interface RoomDoctorRecordsVC : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m index e74709a..3dc08b4 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m @@ -171,7 +171,7 @@ [parmDic setObject:@(self.page) forKey:@"pageNo"]; [parmDic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"RECOMMEND" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"RECOMMEND" NeedToken:@""]; [searchApi GetAllDoctorRecordsList:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h index c3f5658..1fbf56b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/10/20. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface RoomSearchResultViewController : HQBaseViewController +@interface RoomSearchResultViewController : XJBaseViewController @property (nonatomic, copy) NSString * keyWord; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m index ebfa66e..4da0b49 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m @@ -87,7 +87,7 @@ [dic setObject:@"100" forKey:@"pageSize"]; [dic setObject:@"1" forKey:@"pageNumber"]; [dic setObject:self.keyWord forKey:@"search"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"ROOMAPI" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"ROOMAPI" NeedToken:@""]; // GET http://cqyt.dev.yg.dt.io/health-consultation/api/consult/es/searchConDepartment?search=%E5%86%85%E7%A7%91&pageNumber=1&pageSize=100 HTTP/1.1 [searchApi getSearchRoomListData:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h index 3521de7..8f8c95d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h @@ -5,12 +5,12 @@ // Created by 仁康信息 on 2023/4/19. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "FoundExpertSubCollection.h" NS_ASSUME_NONNULL_BEGIN -@interface FoundExpertSubViewController : HQBaseViewController +@interface FoundExpertSubViewController : XJBaseViewController @property (nonatomic, copy) NSString * searchWord; @property (nonatomic, strong) FoundExpertSubCollection * collectView; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m index 276d157..1a64785 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m @@ -65,7 +65,7 @@ [dic setObject:@(1) forKey:@"pageNumber"]; [dic setObject:@(100) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"SicksSEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"SicksSEARCH" NeedToken:@""]; [searchApi getSearchSicksListData:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h index cf2d636..c66e1d1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/18. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface FoundExpertViewController : HQBaseViewController +@interface FoundExpertViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m index 261aa30..00ced20 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m @@ -384,7 +384,7 @@ [self showMBProgressHUDWithString:@"加载中..." autoHidden:NO]; NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; [api getFoundExpertHomeData:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h index ed8f016..8fc9320 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/9. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface FoundHospitalViewController : HQBaseViewController +@interface FoundHospitalViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m index df84d57..6ac4da0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m @@ -130,7 +130,7 @@ [dic setObject:@(20) forKey:@"pageSize"]; [dic setObject:@(self.pageNumber) forKey:@"pageNumber"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"HospitalAPI" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"HospitalAPI" NeedToken:@""]; [searchApi getAllHospatilData:dic]; } @@ -143,7 +143,7 @@ [dic setObject:@(20) forKey:@"pageSize"]; [dic setObject:@(self.pageNumber) forKey:@"pageNumber"]; [dic setObject:keyword forKey:@"search"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"HospitalAPI" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"HospitalAPI" NeedToken:@""]; [searchApi getSearchHospatilData:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h index e4ce01c..dafc4f9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/12. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface FoundJIBingViewController : HQBaseViewController +@interface FoundJIBingViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m index 3895bcf..1781b24 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m @@ -110,7 +110,7 @@ [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:@"0" forKey:@"parentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; [api getSearchjibingListLeftData:dic]; } @@ -206,7 +206,7 @@ [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:parentId forKey:@"departmentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"RightFound" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"RightFound" NeedToken:@""]; [api getSearchjibingListRightData:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h index 5db5570..e2c0bfb 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/19. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface FoundRoomsViewController : HQBaseViewController +@interface FoundRoomsViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m index 9b861e8..9737074 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m @@ -106,7 +106,7 @@ [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:@"0" forKey:@"parentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; [api getSearchRoomListLeftData:dic]; } @@ -204,7 +204,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:parentId forKey:@"parentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"RightFound" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"RightFound" NeedToken:@""]; [api getSearchRoomListLeftData:dic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h index e979df6..a48b311 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/25. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface MainSearchViewController : HQBaseViewController +@interface MainSearchViewController : XJBaseViewController @property (nonatomic, copy) NSString * keywordString; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m index b58eaaa..f72ef9f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m @@ -453,7 +453,7 @@ [dic setObject:@(self.pageNumber) forKey:@"pageNumber"]; [dic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"RoomSEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"RoomSEARCH" NeedToken:@""]; [searchApi getSearchRoomListData:dic]; } @@ -466,7 +466,7 @@ [dic setObject:@(self.pageNumber) forKey:@"pageNumber"]; [dic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"SicksSEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"SicksSEARCH" NeedToken:@""]; [searchApi getSearchSicksListData:dic]; } @@ -478,7 +478,7 @@ [dic setObject:@(self.pageNumber) forKey:@"pageNumber"]; [dic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"DoctorSEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"DoctorSEARCH" NeedToken:@""]; [searchApi getSearchDoctorData:dic]; @@ -493,7 +493,7 @@ [dic setObject:@(self.pageNumber) forKey:@"pageNumber"]; [dic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"HOSPATILSEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"HOSPATILSEARCH" NeedToken:@""]; [searchApi getSearchHospatilData:dic]; } @@ -506,7 +506,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:self.keywordString forKey:@"search"]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"SEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"SEARCH" NeedToken:@""]; [searchApi getSearchZongheData:dic]; @@ -681,7 +681,7 @@ // 1 图文 0 音视频 2 用户须知 [parmDic setObject:@(type) forKey:@"type"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"xuzhi" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"xuzhi" NeedToken:@""]; [detailApi getFoundPopConnetResult :parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h index 6bafb9d..dc5ad57 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/26. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface SearchZhuangJiaViewController : HQBaseViewController +@interface SearchZhuangJiaViewController : XJBaseViewController @property (nonatomic, copy) NSString * doctorName; @property (nonatomic, copy) NSString * hospitalId; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m index 3f53be7..3390a52 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m @@ -321,7 +321,7 @@ [dic setObject:@(20) forKey:@"pageSize"]; // GET http://cqyt.dev.yg.dt.io/health-consultation/api/consult/conDoctor/selectDictListByNHDS?doctorName=&hospitalId=&departmentId=27424429373915145&sickId=&tfSort=1&pageNo=1&pageSize=100 HTTP/1.1 - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"SEARCH" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"SEARCH" NeedToken:@""]; [searchApi getSearchConditionsData:dic]; @@ -334,7 +334,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:@"0" forKey:@"parentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"FOUND" NeedToken:@""]; [api getSearchRoomListLeftData:dic]; } @@ -343,7 +343,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:parentId forKey:@"parentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"RightFound" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"RightFound" NeedToken:@""]; [api getSearchRoomListLeftData:dic]; } @@ -354,7 +354,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; - JKCQAPI * searchApi = [[JKCQAPI alloc] init:self tag:@"HospitalAPI" NeedToken:@""]; + XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"HospitalAPI" NeedToken:@""]; [searchApi getConnditionHospitalData:dic]; } @@ -364,7 +364,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:@"0" forKey:@"parentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"SICKFOUND" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"SICKFOUND" NeedToken:@""]; [api getSearchjibingListLeftData:dic]; @@ -374,7 +374,7 @@ NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [dic setObject:parentId forKey:@"departmentId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"SickRight" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"SickRight" NeedToken:@""]; [api getSearchjibingListRightData:dic]; } @@ -491,7 +491,7 @@ NSDictionary * dic = response; NSArray * array; - if ([dic containsObjectForKey:@"hostitalList"]) { + if ([dic.allKeys containsObject:@"hostitalList"]) { array = [dic objectForKey:@"hostitalList"]; } @@ -863,7 +863,7 @@ // 1 图文 0 音视频 2 用户须知 [parmDic setObject:@(type) forKey:@"type"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"xuzhi" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"xuzhi" NeedToken:@""]; [detailApi getFoundPopConnetResult :parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h index 18ce129..9cbb43a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/5/10. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface SearchMainViewController : HQBaseViewController +@interface SearchMainViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h index 9a4a6db..2360790 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/19. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "QuestionDiseaseInfoModel.h" NS_ASSUME_NONNULL_BEGIN -@interface SelectFIleDateDetailViewController : HQBaseViewController +@interface SelectFIleDateDetailViewController : XJBaseViewController @property (nonatomic, strong) QuestionDiseaseInfoModel * infomodel; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m index 9509df8..c4049be 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m @@ -499,7 +499,7 @@ else { [self showMBProgressHUDWithString:@"上传中" autoHidden:NO]; - JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"UPLOADAPI" NeedToken:@""]; + XJPNetAPI * upApi = [[XJPNetAPI alloc] init:self tag:@"UPLOADAPI" NeedToken:@""]; [upApi postImageArrayUpload:self.selectedPhotos withParmDic:@{@"biz":@""} ]; } @@ -614,7 +614,7 @@ - JKCQAPI * addApi = [[JKCQAPI alloc] init:self tag:@"ADDFILE" NeedToken:@""]; + XJPNetAPI * addApi = [[XJPNetAPI alloc] init:self tag:@"ADDFILE" NeedToken:@""]; [addApi PostMemberShipFileData:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h index cc17968..d54ee0c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/21. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface SelectedDoctorTimeVC : HQBaseViewController +@interface SelectedDoctorTimeVC : XJBaseViewController @property (nonatomic, copy) NSString * doctorId; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m index 82b2ce0..81f47ae 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m @@ -69,7 +69,7 @@ [super viewWillAppear:animated]; //自定义navBar，根据当前的nav自定义 navBar - UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[HQBaseNavigationController class]]]; + UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[XJBaseNavigationController class]]]; //设置导航条字体颜色和大小 // self.navigationController.navigationBar NSDictionary *dict = [NSDictionary dictionary]; @@ -270,7 +270,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DOCTORAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"DOCTORAPI" NeedToken:@""]; [detailApi getDoctorExpertMainData:parmDic]; @@ -282,7 +282,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * timeApi = [[JKCQAPI alloc] init:self tag:@"TimeAPI" NeedToken:@""]; + XJPNetAPI * timeApi = [[XJPNetAPI alloc] init:self tag:@"TimeAPI" NeedToken:@""]; [timeApi getExpertDoctorHaveTimeData:parmDic]; @@ -435,7 +435,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; [detailApi getCancelCollectDoctorExpertData:parmDic]; @@ -446,7 +446,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; [detailApi getCollectDoctorExpertData:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h index 7ac0f2d..3f8c96c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/14. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface SelectedQuestionViewController : HQBaseViewController +@interface SelectedQuestionViewController : XJBaseViewController @property (nonatomic, assign) NSInteger questionType; //1 图文 2音视频 @property (nonatomic, copy) NSString * doctorID; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m index 5dccdff..a8c789a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m @@ -181,7 +181,7 @@ [parmDic setObject:@"" forKey:@"memberId"]; [parmDic setObject:self.doctorID forKey:@"toAccount"]; [parmDic setObject:upID forKey:@"medicalRecordsId"]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; [questionApi postPictureQuestionAPI:parmDic]; } @@ -234,7 +234,7 @@ [parmDic setObject:onID forKey:@"medicalRecordsId"]; if (self.questionType == 1) { [self showMBProgressHUDWithString:@"等待发起会话" autoHidden:NO]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"PICTURE" NeedToken:@""]; [questionApi postPictureQuestionAPI:parmDic]; } @@ -246,7 +246,7 @@ [parmDic setObject:@"2" forKey:@"contentType"]; [parmDic setObject:self.schedulingDateId forKey:@"schedulingDateId"]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"VIDEO" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"VIDEO" NeedToken:@""]; [questionApi postVideoQuestionAPI:parmDic]; } @@ -260,7 +260,7 @@ [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@(10) forKey:@"pageSize"]; - JKCQAPI * questionApi = [[JKCQAPI alloc] init:self tag:@"QUESTION" NeedToken:@""]; + XJPNetAPI * questionApi = [[XJPNetAPI alloc] init:self tag:@"QUESTION" NeedToken:@""]; [questionApi getMembersSicksList:parmDic]; @@ -371,7 +371,7 @@ - (void)loginImAccount { [self showMBProgressHUDWithString:@"等待发起会话" autoHidden:NO]; - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h index 149381d..fb9169c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/29. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface SmallHelpHandViewController : HQBaseViewController +@interface SmallHelpHandViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h index efaad0d..223cc60 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h @@ -5,12 +5,12 @@ // Created by 仁康信息 on 2023/4/18. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "QuestionPeopleModel.h" NS_ASSUME_NONNULL_BEGIN -@interface XJAddQuestionViewController : HQBaseViewController +@interface XJAddQuestionViewController : XJBaseViewController @property (nonatomic, strong) QuestionPeopleModel * questionModel; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m index 4ca4abd..a11f4d8 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m @@ -283,7 +283,7 @@ - (void)getFamilyMembers { - JKCQAPI * memberApi = [[JKCQAPI alloc] init:self tag:@"Family" NeedToken:@""]; + XJPNetAPI * memberApi = [[XJPNetAPI alloc] init:self tag:@"Family" NeedToken:@""]; [memberApi getCheckKeyResult:@{@"dictKey":@"family_member_relation"}]; @@ -515,7 +515,7 @@ } [parmDic setObject:self.familyInt forKey:@"familyRelation"]; [parmDic setObject:self.questionModel.people_id forKey:@"id"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"updataAPI" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"updataAPI" NeedToken:@""]; [api postUpdateQuestionFailyMembers:parmDic]; @@ -572,7 +572,7 @@ [parmDic setObject:self.weightTextField.text forKey:@"weight"]; [parmDic setObject:self.familyInt forKey:@"familyRelation"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; [api getAddQuestionFailyMembers:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h index 9909ae4..b121312 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/21. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJBasicHealthInfoViewController : HQBaseViewController +@interface XJBasicHealthInfoViewController : XJBaseViewController @property (nonatomic, strong) NSString * memberId; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m index 1cac0c3..618960b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m @@ -104,7 +104,7 @@ [parmDic setObject:self.memberId forKey:@"memberId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"MEMBERAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"MEMBERAPI" NeedToken:@""]; [detailApi getQustionOptionsMembers :parmDic]; @@ -247,7 +247,7 @@ [parmDic setObject:jsonArray forKey:@"list"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"UPHEALTH" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"UPHEALTH" NeedToken:@""]; [detailApi postBaseHealthInfoAPI :parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h index c1e984d..04d51e0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h @@ -5,12 +5,12 @@ // Created by 仁康信息 on 2023/4/20. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "QuestionDiseaseInfoModel.h" NS_ASSUME_NONNULL_BEGIN -@interface XJDoctorMainViewController : HQBaseViewController +@interface XJDoctorMainViewController : XJBaseViewController @property (nonatomic, strong) QuestionDiseaseInfoModel * disModel; @property (nonatomic, strong) NSString * yuyue_id; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m index 18040e3..194216a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m @@ -276,7 +276,7 @@ [parmDic setObject:self.yuyue_id forKey:@"id"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"ReportApi" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"ReportApi" NeedToken:@""]; [detailApi getAppointmentReportDetailAPI:parmDic]; } @@ -422,7 +422,7 @@ [parmDic setObject:doctorModel.doctor_id forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; [detailApi getCancelCollectDoctorExpertData:parmDic]; @@ -434,7 +434,7 @@ else [parmDic setObject:doctorModel.doctor_id forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; [detailApi getCollectDoctorExpertData:parmDic]; @@ -621,7 +621,7 @@ else [parmDic setObject:self.sessionModel.yuyue_id forKey:@"id"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"CANCELQUESTION" NeedToken:nil]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"CANCELQUESTION" NeedToken:nil]; [api getCancelQuestion:parmDic]; @@ -648,7 +648,7 @@ else [parmDic setObject:self.sessionModel.yuyue_id forKey:@"sessionId"]; [parmDic setObject:isNiming forKey:@"tfUnknow"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"DoctorSource" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"DoctorSource" NeedToken:@""]; [endApi PostQustionDoctorScore:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h index 8e1faab..9a9bf22 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/14. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJEvaluationListViewController : HQBaseViewController +@interface XJEvaluationListViewController : XJBaseViewController @property (nonatomic, copy) NSString * hospitalID; @property (nonatomic, assign) NSInteger type; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m index 926ff50..a74d090 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m @@ -137,7 +137,7 @@ [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@"10" forKey:@"pageSize"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DoctorAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"DoctorAPI" NeedToken:@""]; [detailApi getExpertDoctorEvluateData:parmDic]; } @@ -150,7 +150,7 @@ [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@"10" forKey:@"pageSize"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"EVALUATAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"EVALUATAPI" NeedToken:@""]; [detailApi getHospatilEvaluate:parmDic]; } @@ -161,7 +161,7 @@ [parmDic setObject:self.hospitalID forKey:@"hospitalId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"SCOREAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"SCOREAPI" NeedToken:@""]; [detailApi getHospatilScore:parmDic]; @@ -173,7 +173,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"SCOREAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"SCOREAPI" NeedToken:@""]; [detailApi getDoctorScore:parmDic]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h index 633aacd..f832414 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/16. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJExpertMainViewController : HQBaseViewController +@interface XJExpertMainViewController : XJBaseViewController @property (nonatomic, copy) NSString * doctorId; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m index 7a0b9ef..3cbf12a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m @@ -355,7 +355,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DOCTORAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"DOCTORAPI" NeedToken:@""]; [detailApi getDoctorExpertMainData:parmDic]; @@ -369,7 +369,7 @@ [parmDic setObject:@"1" forKey:@"pageNo"]; [parmDic setObject:@"4" forKey:@"pageSize"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"evluateAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"evluateAPI" NeedToken:@""]; [detailApi getExpertDoctorEvluateData:parmDic]; @@ -629,7 +629,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; [detailApi getCancelCollectDoctorExpertData:parmDic]; @@ -640,7 +640,7 @@ [parmDic setObject:self.doctorId forKey:@"doctorId"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; [detailApi getCollectDoctorExpertData:parmDic]; } @@ -698,7 +698,7 @@ [parmDic setObject:type forKey:@"type"]; - JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:[NSString stringWithFormat:@"xuzhi_%@",type] NeedToken:@""]; + XJPNetAPI * detailApi = [[XJPNetAPI alloc] init:self tag:[NSString stringWithFormat:@"xuzhi_%@",type] NeedToken:@""]; [detailApi getFoundPopConnetResult :parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h index 1e65ed7..dc8df36 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/6/19. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJFileDataDetailViewController : HQBaseViewController +@interface XJFileDataDetailViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h index bd48a74..7390de5 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/6. // -#import "BaseWebViewVC.h" +#import "XJBaseWebViewVC.h" NS_ASSUME_NONNULL_BEGIN -@interface ADJumpViewController : BaseWebViewVC +@interface ADJumpViewController : XJBaseWebViewVC diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h index 872c0d8..772c898 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h @@ -5,13 +5,13 @@ // Created by Apple on 2024/2/26. // -#import "BaseWebViewVC.h" +#import "XJBaseWebViewVC.h" #import #import NS_ASSUME_NONNULL_BEGIN -@interface LookReportImageViewController : HQBaseViewController +@interface LookReportImageViewController : XJBaseViewController @property (nonatomic, strong) NSString * webTitle; diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h index 3a723b6..eeb3cfe 100644 --- a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h +++ b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/4/13. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XJSosCenterViewController : HQBaseViewController +@interface XJSosCenterViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m index 6cfc881..287bb1b 100644 --- a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m +++ b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m @@ -494,7 +494,7 @@ [parmDic setObject:self.type forKey:@"resourceId"]; - JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"CALLAPI" NeedToken:@""]; + XJPNetAPI * sosApi = [[XJPNetAPI alloc] init:self tag:@"CALLAPI" NeedToken:@""]; [sosApi PostSoSPhoneEmergency:parmDic]; [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"tel://120"] options:nil completionHandler:^(BOOL success) { @@ -517,7 +517,7 @@ [parmDic setObject:@"0" forKey:@"name"]; // param type 1:油田医院 3:健康小屋 4:aed 5:救护车 不传则全部 - JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"GroupAPI" NeedToken:@""]; + XJPNetAPI * sosApi = [[XJPNetAPI alloc] init:self tag:@"GroupAPI" NeedToken:@""]; [sosApi getSoSCreateGroupChat:parmDic]; } @@ -614,7 +614,7 @@ [parmDic setObject:@(latitude) forKey:@"latitude"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"RESOURCES" NeedToken:@""]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"RESOURCES" NeedToken:@""]; [api GetSoSHomePageResources:parmDic]; } @@ -724,7 +724,7 @@ - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h index e6bcbf2..16af38e 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/2/13. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface ChatListViewController : HQBaseViewController +@interface ChatListViewController : XJBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h index e1825ad..875982a 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h @@ -5,13 +5,13 @@ // Created by 仁康信息 on 2023/2/13. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" #import "QuestionDiseaseInfoModel.h" //#import "TUIBaseChatViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface ChatViewController : HQBaseViewController +@interface ChatViewController : XJBaseViewController @property (nonatomic, strong) NSString * chatID; diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m index d76bcf1..ea4df15 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m @@ -257,7 +257,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:userid forKey:@"helpId"]; - JKCQAPI * smallApi = [[JKCQAPI alloc] init:self tag:@"smallAPI" NeedToken:@""]; + XJPNetAPI * smallApi = [[XJPNetAPI alloc] init:self tag:@"smallAPI" NeedToken:@""]; [smallApi GetisSmallHelp:parmDic]; } @@ -300,21 +300,21 @@ [self showMBProgressHUDWithString:@"正在结束本次应急" autoHidden:false]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:self.sosEnd_id forKey:@"id"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"ENDSOSAPI" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"ENDSOSAPI" NeedToken:@""]; [endApi PostEndSoSIMQuestion:parmDic]; } if (self.questionType == 2) { [self showMBProgressHUDWithString:@"正在结束本次会话" autoHidden:false]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:self.pictureEnd_id forKey:@"id"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"ENDPICTUREAPI" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"ENDPICTUREAPI" NeedToken:@""]; [endApi GetEndPictureEndIMQuestion:parmDic]; } if (!ValidStr(self.smallHelp_id)) { [self showMBProgressHUDWithString:@"正在结束本次会话" autoHidden:false]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:self.smallHelp_id forKey:@"id"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"ENDPICTUREAPI" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"ENDPICTUREAPI" NeedToken:@""]; [endApi GetEndPictureEndIMQuestion:parmDic]; } } @@ -336,7 +336,7 @@ [parmDic setObject:self.dangan_id forKey:@"id"]; } - JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; + XJPNetAPI * upApi = [[XJPNetAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; [upApi GetLookModficalMemberShipFileData:parmDic]; @@ -483,7 +483,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:@(sendTime) forKey:@"sendTime"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"TIME" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"TIME" NeedToken:@""]; [endApi GetDoctoresExpireTime:parmDic]; } @@ -678,7 +678,7 @@ [parmDic setObject:self.pictureEnd_id forKey:@"sessionId"]; [parmDic setObject:isNiming forKey:@"tfUnknow"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"DoctorSource" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"DoctorSource" NeedToken:@""]; [endApi PostQustionDoctorScore:parmDic]; } @@ -798,7 +798,7 @@ - (void)loginImAccount { - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; + XJPNetAPI * proctocolApi = [[XJPNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h index 1a39b16..2791b39 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h @@ -5,13 +5,13 @@ // Created by 仁康信息 on 2023/7/5. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN typedef void(^sendUserSoSLocation)(CLLocationCoordinate2D coordinate); -@interface ChatMapViewController : HQBaseViewController +@interface ChatMapViewController : XJBaseViewController @property (nonatomic, copy) sendUserSoSLocation mapBlcok; diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/CurrentLocationViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/CurrentLocationViewController.h index 2ef951f..216ff28 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/CurrentLocationViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/CurrentLocationViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/8/15. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface CurrentLocationViewController : HQBaseViewController +@interface CurrentLocationViewController : XJBaseViewController @property (nonatomic, assign) double longitude; diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h index f5b239f..0a9ba5d 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h @@ -5,11 +5,11 @@ // Created by 仁康信息 on 2023/7/27. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface SendHealthDataViewController : HQBaseViewController +@interface SendHealthDataViewController : XJBaseViewController @property (nonatomic, strong) NSString * memberId_id; diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m index 90972c1..f42031f 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m @@ -56,7 +56,7 @@ [parmDic setObject:self.memberId_id forKey:@"memberId"]; - JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"HEALTHDATA" NeedToken:nil]; + XJPNetAPI * api = [[XJPNetAPI alloc] init:self tag:@"HEALTHDATA" NeedToken:nil]; [api getsendHealthDataReportAPI:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.h b/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.h index e7faa71..bf7e724 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.h @@ -5,11 +5,11 @@ // Created by Apple on 2024/8/22. // -#import "HQBaseViewController.h" +#import "XJBaseViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface DoctorHomePageDetailVC : HQBaseViewController +@interface DoctorHomePageDetailVC : XJBaseViewController @property (nonatomic, strong) NSString * userID; diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.m b/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.m index 6d0da0f..59923e2 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/DoctorHomePageDetailVC.m @@ -161,7 +161,7 @@ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:self.userID forKey:@"helpId"]; - JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"Detail" NeedToken:@""]; + XJPNetAPI * endApi = [[XJPNetAPI alloc] init:self tag:@"Detail" NeedToken:@""]; [endApi GetSmllHelpDetail:parmDic]; } diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我 1.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我 1.png deleted file mode 100644 index 7a4e6ab..0000000 Binary files a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我 1.png and /dev/null differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我 2.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我 2.png deleted file mode 100644 index 7a4e6ab..0000000 Binary files a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我 2.png and /dev/null differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我.png deleted file mode 100644 index 7a4e6ab..0000000 Binary files a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/3、健康油我.png and /dev/null differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024 1.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024 1.png new file mode 100644 index 0000000..7b1466b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024 1.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024 2.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024 2.png new file mode 100644 index 0000000..7b1466b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024 2.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024.png new file mode 100644 index 0000000..7b1466b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/5、健康油我-1024.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json index 31337df..237f9c6 100644 --- a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "3、健康油我.png", + "filename" : "5、健康油我-1024.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" @@ -13,7 +13,7 @@ "value" : "dark" } ], - "filename" : "3、健康油我 1.png", + "filename" : "5、健康油我-1024 1.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" @@ -25,7 +25,7 @@ "value" : "tinted" } ], - "filename" : "3、健康油我 2.png", + "filename" : "5、健康油我-1024 2.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/XinjiangProject/XinjiangProject/Supporting Files/PrefixHeader.pch b/XinjiangProject/XinjiangProject/Supporting Files/PrefixHeader.pch index 06b4cbf..bfe5924 100644 --- a/XinjiangProject/XinjiangProject/Supporting Files/PrefixHeader.pch +++ b/XinjiangProject/XinjiangProject/Supporting Files/PrefixHeader.pch @@ -22,9 +22,9 @@ //基础类 #import "AppDelegate.h" #import "AppDelegate+AppService.h" -#import "HQBaseViewController.h" -#import "HQBaseNavigationController.h" -#import "HQBaseTabBarController.h" +#import "XJBaseViewController.h" +#import "XJBaseNavigationController.h" +#import "XJBaseTabBarController.h" #import "HQUserInfo.h" #import "IMUserInfoModel.h" @@ -54,7 +54,7 @@ #import "TUICommonModel.h" //工具类 #import "LYEmptyViewHeader.h" -#import "JKCQAPI.h" +#import "XJPNetAPI.h" #import "ESCTUIManager.h" #import "XMButton.h" #import "UIView+Effects.h" diff --git a/XinjiangProject/XinjiangProject/ThirdParty/TYMapNavSheet/TYMapNavSheet.m b/XinjiangProject/XinjiangProject/ThirdParty/TYMapNavSheet/TYMapNavSheet.m index cff354e..15fbe54 100644 --- a/XinjiangProject/XinjiangProject/ThirdParty/TYMapNavSheet/TYMapNavSheet.m +++ b/XinjiangProject/XinjiangProject/ThirdParty/TYMapNavSheet/TYMapNavSheet.m @@ -87,43 +87,72 @@ [self AddMapNamewithLocationDic:TYMapLocationDic withstartCoor:startCoor withendCoor:endCoor]; if (IOS8) { - UIAlertController * TYMapNavSheetController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; - [TYMapNavSheetController addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { - //按钮触发的方法 + UIAlertController *TYMapNavSheetController = [UIAlertController alertControllerWithTitle:nil + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; + [TYMapNavSheetController addAction:[UIAlertAction actionWithTitle:@"取消" + style:UIAlertActionStyleCancel + handler:^(UIAlertAction * _Nonnull action) { + // 按钮触发的方法 }]]; - [TYMapNavSheetController addAction:[UIAlertAction actionWithTitle:@"使用系统自带地图导航" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - //按钮触发的方法 - MKMapItem *currentLocation = [[MKMapItem alloc] initWithPlacemark:[[MKPlacemark alloc] initWithCoordinate:startCoor addressDictionary:nil]]; - //目的地的位置 - MKMapItem *toLocation = [[MKMapItem alloc] initWithPlacemark:[[MKPlacemark alloc] initWithCoordinate:endCoor addressDictionary:nil ]]; - toLocation.name = [TYMapLocationDic objectForKey:@"endName"]; - currentLocation.name = [TYMapLocationDic objectForKey:@"startName"];; - NSArray *items = [NSArray arrayWithObjects:currentLocation, toLocation, nil]; - NSDictionary *options = @{ MKLaunchOptionsDirectionsModeKey:MKLaunchOptionsDirectionsModeDriving, MKLaunchOptionsMapTypeKey: [NSNumber numberWithInteger:MKMapTypeStandard], MKLaunchOptionsShowsTrafficKey:@YES }; - //打开苹果自身地图应用，并呈现特定的item + + [TYMapNavSheetController addAction:[UIAlertAction actionWithTitle:@"使用系统自带地图导航" + style:UIAlertActionStyleDefault + handler:^(UIAlertAction * _Nonnull action) { + // 系统自带地图导航 + MKMapItem *currentLocation = [[MKMapItem alloc] initWithPlacemark: + [[MKPlacemark alloc] initWithCoordinate:startCoor addressDictionary:nil]]; + MKMapItem *toLocation = [[MKMapItem alloc] initWithPlacemark: + [[MKPlacemark alloc] initWithCoordinate:endCoor addressDictionary:nil]]; + toLocation.name = TYMapLocationDic[@"endName"] ?: @"终点"; + currentLocation.name = TYMapLocationDic[@"startName"] ?: @"起点"; + + NSArray *items = @[currentLocation, toLocation]; + NSDictionary *options = @{ + MKLaunchOptionsDirectionsModeKey: MKLaunchOptionsDirectionsModeDriving, + MKLaunchOptionsMapTypeKey: @(MKMapTypeStandard), + MKLaunchOptionsShowsTrafficKey: @YES + }; [MKMapItem openMapsWithItems:items launchOptions:options]; }]]; - for (NSDictionary * Dic in TYMapSheetTitleArray) { - [TYMapNavSheetController addAction:[UIAlertAction actionWithTitle:[NSString stringWithFormat:@"使用%@导航", [Dic objectForKey:@"name"]] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { - //按钮触发的方法 - NSDictionary *mapDic = Dic; - NSString *urlString = mapDic[@"url"]; - urlString = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - NSURL *url = [NSURL URLWithString:urlString]; - [[UIApplication sharedApplication] openURL:url]; + + for (NSDictionary *Dic in TYMapSheetTitleArray) { + [TYMapNavSheetController addAction:[UIAlertAction actionWithTitle: + [NSString stringWithFormat:@"使用%@导航", Dic[@"name"] ?: @""] + style:UIAlertActionStyleDefault + handler:^(UIAlertAction * _Nonnull action) { + // 打开第三方地图 + NSString *urlString = Dic[@"url"]; + if (![urlString isKindOfClass:[NSString class]] || urlString.length == 0) return; + + NSString *encodedUrl = [urlString stringByAddingPercentEncodingWithAllowedCharacters: + [NSCharacterSet URLQueryAllowedCharacterSet]]; + NSURL *url = [NSURL URLWithString:encodedUrl]; + + if ([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + } else { + [[UIApplication sharedApplication] openURL:url]; + } + } }]]; } + [superViewColtroller presentViewController:TYMapNavSheetController animated:YES completion:nil]; - }else{ - UIActionSheet * TYMapNavSheet = [[UIActionSheet alloc] init]; + + } else { + // 老系统使用 UIActionSheet（建议未来移除） + UIActionSheet *TYMapNavSheet = [[UIActionSheet alloc] init]; [TYMapNavSheet addButtonWithTitle:@"使用系统自带地图导航"]; - for (NSDictionary * Dic in TYMapSheetTitleArray) { - [TYMapNavSheet addButtonWithTitle:[NSString stringWithFormat:@"使用%@导航", [Dic objectForKey:@"name"]]]; + for (NSDictionary *Dic in TYMapSheetTitleArray) { + [TYMapNavSheet addButtonWithTitle:[NSString stringWithFormat:@"使用%@导航", Dic[@"name"] ?: @""]]; } [TYMapNavSheet addButtonWithTitle:@"取消"]; TYMapNavSheet.delegate = superViewColtroller; [TYMapNavSheet showInView:superViewColtroller.view]; } + } -(void) actionsheetClick:(NSInteger)BtnIndex @@ -147,8 +176,13 @@ NSString *urlString = mapDic[@"url"]; urlString = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; NSURL *url = [NSURL URLWithString:urlString]; - [[UIApplication sharedApplication] openURL:url]; - } + if ([[UIApplication sharedApplication] canOpenURL:url]) { + if (@available(iOS 10.0, *)) { + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; + } else { + [[UIApplication sharedApplication] openURL:url]; + } + } } } }