renkang/xj-ios
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新新疆需求

Browse Source
This commit is contained in:
History
2025-11-21 13:46:29 +08:00
parent 2ec6c65bef
commit 4aba54ce74
154 changed files with 664 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj
+2 -2
View File
@@ -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";
XinjiangProject/XinjiangProject/Define/StatusMacros.h
-1
View File
@@ -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" //
XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h
-27
View File
@@ -1,27 +0,0 @@
//
// SDGETHealthTokenManager.h
// XinjiangProject
//
// Created by 仁康信息 on 2024/1/4.
//
#import <Foundation/Foundation.h>
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
XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m
-195
View File
@@ -1,195 +0,0 @@
//
// SDGETHealthTokenManager.m
// XinjiangProject
//
// Created by 仁康信息 on 2024/1/4.
//
#import "SDGETHealthTokenManager.h"
#include <CommonCrypto/CommonDigest.h>
#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
XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.h
-33
View File
@@ -1,33 +0,0 @@
//
// SDHttpRequest.h
// colorPrintingMaster
//
// Created by 青山小明 on 17/5/3.
// Copyright © 2017年 zhangming. All rights reserved.
//
#import <Foundation/Foundation.h>
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
XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDHttpRequest.m
-133
View File
@@ -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 <CommonCrypto/CommonDigest.h>
#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<AFMultipartFormData> _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
XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h → XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.h
+1 -1
View File
@@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import "JKCQNetworkingWithCache.h"
@interface JKCQAPI : NSObject
@interface XJPNetAPI : NSObject
@property (nonatomic,strong) JKCQNetworkingWithCache * httpRequest;
XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m → XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/XJPNetAPI.m
+3 -9
View File
@@ -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;
XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m
+2 -2
View File
@@ -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];
XinjiangProject/XinjiangProject/Manager/UserManager/HQUserInfo.m
+32 -13
View File
@@ -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;
}
}
XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.h
-1
View File
@@ -13,7 +13,6 @@
//初始化服务
-(void)initService;
- (void)chageUrlService;
//初始化 window
-(void)initWindow;
XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m
+6 -104
View File
@@ -6,7 +6,7 @@
//
#import "AppDelegate+AppService.h"
#import "HQBaseTabBarController.h"
#import "XJBaseTabBarController.h"
//#import "XJLoginViewController.h"
#import "XJLoginTopChangeViewController.h"
#import <IQKeyboardManager/IQKeyboardManager.h>
@@ -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];
XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.h
+2 -2
View File
@@ -6,7 +6,7 @@
//
#import <UIKit/UIKit.h>
#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;
XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m
+1 -5
View File
@@ -19,11 +19,7 @@
//前缀请求
//初始化高德地图
[self configureAPIKey];
//前缀请求
[self chageUrlService];
[self configureAPIKey];
[self initService];
//初始化window
[self initWindow];
XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h
-18
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.h → XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.h
+2 -2
View File
@@ -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
/*!
* 返回到指定的类视图
XinjiangProject/XinjiangProject/Project/Base/HQBaseNavigationController.m → XinjiangProject/XinjiangProject/Project/Base/XJBaseNavigationController.m
+6 -6
View File
@@ -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 ()<UINavigationControllerDelegate,UIGestureRecognizerDelegate>
@interface XJBaseNavigationController ()<UINavigationControllerDelegate,UIGestureRecognizerDelegate>
@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];
XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.h → XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.h
+2 -2
View File
@@ -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
/**
设置小红点
XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m → XinjiangProject/XinjiangProject/Project/Base/XJBaseTabBarController.m
+5 -5
View File
@@ -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 ()<UITabBarControllerDelegate>
@interface XJBaseTabBarController ()<UITabBarControllerDelegate>
@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];
XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.h → XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.h
+2 -2
View File
@@ -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
/**
* 修改状态栏颜色
XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m → XinjiangProject/XinjiangProject/Project/Base/XJBaseViewController.m
+3 -3
View File
@@ -5,14 +5,14 @@
// Created by xulei on 2022/8/11.
//
#import "HQBaseViewController.h"
#import "XJBaseViewController.h"
#import "XJLoginViewController.h"
@interface HQBaseViewController ()<MBProgressHUDDelegate>
@interface XJBaseViewController ()<MBProgressHUDDelegate>
@end
@implementation HQBaseViewController
@implementation XJBaseViewController
- (UIStatusBarStyle)preferredStatusBarStyle{
return _StatusBarStyle;
XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.h → XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.h
+2 -2
View File
@@ -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<UIAlertViewDelegate,WKNavigationDelegate, WKUIDelegate, WebJSExport, WKScriptMessageHandler>
@interface XJBaseWebViewVC : XJBaseViewController<UIAlertViewDelegate,WKNavigationDelegate, WKUIDelegate, WebJSExport, WKScriptMessageHandler>
@property (nonatomic, strong) NSString *webUrl;
@property (nonatomic, strong) NSString *webTitle;
XinjiangProject/XinjiangProject/Project/Base/BaseWebViewVC.m → XinjiangProject/XinjiangProject/Project/Base/XJBaseWebViewVC.m
+4 -4
View File
@@ -1,13 +1,13 @@
//
// BaseWebViewVC.m
// XJBaseWebViewVC.m
// ScarHousekeeper
//
// Created by 张小万 on 2021/1/21.
//
#import "BaseWebViewVC.h"
#import "XJBaseWebViewVC.h"
@interface BaseWebViewVC ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate>
@interface XJBaseWebViewVC ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate>
@property (nonatomic, strong)NSURL *originalUrl;
@property (nonatomic, copy)NSString *videoUrl;
@@ -16,7 +16,7 @@
@end
@implementation BaseWebViewVC
@implementation XJBaseWebViewVC
#pragma mark - LifeCycle
XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h
+3
View File
@@ -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
XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h
+1 -1
View File
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface CustomTUIBaseMessageController : HQBaseViewController
@interface CustomTUIBaseMessageController : XJBaseViewController
@property(nonatomic, strong) NSString * groupID;
XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h
+2
View File
@@ -8,10 +8,12 @@
#import <TIMCommon/TUIBubbleMessageCell.h>
#import <TIMCommon/TUIMessageCell.h>
#import "CustomMapMessageCellData.h"
#import "CustomTUIHistoryModel.h"
@interface CustomMapMessageCell : UITableViewCell
@property (nonatomic, strong) CustomTUIHistoryModel * model;
@end
XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m
+174 -13
View File
@@ -6,13 +6,19 @@
//
#import "CustomMapMessageCell.h"
#import<CommonCrypto/CommonDigest.h>
@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]
];
}
XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m
+3 -3
View File
@@ -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]];
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginTopChangeViewController.m
+42 -16
View File
@@ -15,6 +15,8 @@
#import "XJRegisterViewController.h"
#import "LVKeyboard.h"
#import "MQTextField.h"
#import "XJTYFoundPassWordViewController.h"
@interface XJLoginTopChangeViewController ()<V2TIMSDKListener,V2TIMSDKListener,LVKeyboardDelegate,UITextFieldDelegate>
@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];
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m
+6 -4
View File
@@ -15,6 +15,8 @@
#import "XJRegisterViewController.h"
#import "LVKeyboard.h"
#import "MQTextField.h"
#import "XJTYFoundPassWordViewController.h"
@interface XJLoginViewController ()<V2TIMSDKListener,V2TIMSDKListener,LVKeyboardDelegate,UITextFieldDelegate>
@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];
XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.h
+16
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m → XinjiangProject/XinjiangProject/Project/Login_Register/XJTYFoundPassWordViewController.m
+7 -5
View File
@@ -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;
}
/*
XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m
+3 -3
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m
+3 -3
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h
+2 -2
View File
@@ -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 音视频
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m
+2 -2
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m
+2 -2
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m
+7 -9
View File
@@ -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"]) {
XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h → XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.h
+3 -3
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m → XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringDetailViewController.m
+5 -5
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h → XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.h
+3 -3
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m → XinjiangProject/XinjiangProject/Project/Monitoring/Controller/XJMonitoringHistoryController.m
+5 -5
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m
+5 -5
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m
+10 -10
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m
+1 -1
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m
+2 -2
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m
+2 -2
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m
+5 -105
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m
+3 -3
View File
@@ -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];
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.h
+2 -2
View File
@@ -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
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h
+2 -2
View File
@@ -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;
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m
+1 -1
View File
@@ -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];
}
XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h
+2 -2
View File
@@ -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;

Some files were not shown because too many files have changed in this diff Show More