diff --git a/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.h b/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.h index 3ed771f..518e2fa 100644 --- a/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.h +++ b/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.h @@ -1,6 +1,6 @@ // // NSArray+Sudoku.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/3/4. // diff --git a/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.m b/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.m index 7fe295c..cc785a9 100644 --- a/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.m +++ b/XinjiangProject/XinjiangProject/Categorys/NSArray/NSArray+Sudoku.m @@ -1,6 +1,6 @@ // // NSArray+Sudoku.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/3/4. // diff --git a/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.h b/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.h index b270fcc..a5a0b28 100644 --- a/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.h +++ b/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.h @@ -1,6 +1,6 @@ // // NSAttributedString+Extension.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/3/14. // diff --git a/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.m b/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.m index b8c4ce7..6885856 100644 --- a/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.m +++ b/XinjiangProject/XinjiangProject/Categorys/NSAttributedString+Extension.m @@ -1,6 +1,6 @@ // // NSAttributedString+Extension.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/3/14. // diff --git a/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.h b/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.h index e481868..a076804 100644 --- a/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.h +++ b/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.h @@ -1,6 +1,6 @@ // // UIDevice+model.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/3/29. // diff --git a/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.m b/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.m index 487561f..dfa9bd0 100644 --- a/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.m +++ b/XinjiangProject/XinjiangProject/Categorys/UIDevice/UIDevice+model.m @@ -1,6 +1,6 @@ // // UIDevice+model.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/3/29. // diff --git a/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.h b/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.h index bb23801..b76c3c2 100644 --- a/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.h +++ b/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.h @@ -1,6 +1,6 @@ // // UIImage+RoundedCorner.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/4/24. // diff --git a/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.m b/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.m index ade1a26..6c29873 100644 --- a/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.m +++ b/XinjiangProject/XinjiangProject/Categorys/UIImage+RoundedCorner.m @@ -1,6 +1,6 @@ // // UIImage+RoundedCorner.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/4/24. // diff --git a/XinjiangProject/XinjiangProject/Define/StatusMacros.h b/XinjiangProject/XinjiangProject/Define/StatusMacros.h index 1fffed9..f8d7f20 100755 --- a/XinjiangProject/XinjiangProject/Define/StatusMacros.h +++ b/XinjiangProject/XinjiangProject/Define/StatusMacros.h @@ -82,9 +82,9 @@ //#define IntervenH5 @"https://starry.out.icdat.cn" //开发环境地址 -#define Http @"http://cqyt.dev.yg.dt.io"// -#define H5DevHost @"cqyt.dev.yg.dt.io"// -#define IntervenH5 @"http://cms.dev.yg.dt.io" +#define Http @"https://xjgateway.mcrm.vip:8888"// +#define H5DevHost @"xjgateway.mcrm.vip:8888"// +#define IntervenH5 @"https://xjconsole.mcrm.vip:8888" #define BASEURL @"https://yyjk.cqygjk.com" //北边接口前缀 #define SCHEME @"http" // diff --git a/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h b/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h index 7faacde..9156fed 100755 --- a/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h +++ b/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h @@ -184,7 +184,7 @@ alpha:1.0]) //数据验证 #define StrValid(f) ([f isKindOfClass:[NSNull class]] || f == nil || [f length] < 1 || [f isEqualToString:@"(null)"] || [f isEqualToString:@""] || [f isEqualToString:@"null"]? YES : NO) -#define SafeStr(f) (StrValid(f) ? f:@"") +#define SafeStr(f) (!StrValid(f) ? f:@"-") #define HasString(str,key) ([str rangeOfString:key].location!=NSNotFound) #define ValidStr(f) StrValid(f) diff --git a/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.h b/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.h index 7579ab1..8f24bb9 100644 --- a/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.h +++ b/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.h @@ -1,6 +1,6 @@ // // CQAudioPlayManager.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/5. // diff --git a/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.m b/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.m index 7e56838..7f225d1 100644 --- a/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.m +++ b/XinjiangProject/XinjiangProject/Manager/AudioManager/CQAudioPlayManager.m @@ -1,6 +1,6 @@ // // CQAudioPlayManager.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/5. // diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.h b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.h index 85533d9..2ea4291 100644 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.h +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.h @@ -1,6 +1,6 @@ // // DownToolsManager.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/1. // diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.m index 481c18b..1401575 100644 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.m +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/DownToolsManager.m @@ -1,6 +1,6 @@ // // DownToolsManager.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/1. // diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h index 0a0dac5..58d7601 100755 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.h @@ -123,4 +123,14 @@ - (void)getMinitringWatchData:(NSMutableDictionary *)parmDic; +- (void)getInterMonitoringMaxMinData:(NSMutableDictionary *)parmDic; + +- (void)getWranHistoryList:(NSMutableDictionary *)parmDic; + +- (void)getSOSDoctorRecordList:(NSMutableDictionary *)parmDic; + +- (void)getSOSDoctorDetailInfo:(NSMutableDictionary *)parmDic; + +- (void)getSOSSmallSumData:(NSMutableDictionary *)parmDic; + @end diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m index c7c6ad7..5f9f96d 100755 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQAPI.m @@ -550,7 +550,7 @@ - (void)getUserAgreementPrivacy:(NSMutableDictionary *)parmDic { //GET https://cqyt.test.yg.icdat.cn/health-consultation/api/consult/conDoctor/selectDictList?dictKey=jump_url HTTP/1.1 - [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-consultation/api/consult/conDoctor/selectDictList?dictKey=qh_ios_jump_url",Http] params:parmDic]; + [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-consultation/api/consult/conDoctor/selectDictList?dictKey=jump_url",Http] params:parmDic]; } @@ -748,4 +748,35 @@ } +- (void)getInterMonitoringMaxMinData:(NSMutableDictionary *)parmDic { + + [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-watch/watchH5Api/thresholdSetting",Http] params:parmDic]; +} + +- (void)getWranHistoryList:(NSMutableDictionary *)parmDic { +// https://health-api.tzgl.shuziweidao.com/health-watch/watchH5Api/historicalWarn?eventType=spo2&queryDate=2025-07-01&userId=1898914204455915521&pageNo=1&pageSize=100 + [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-watch/watchH5Api/historicalWarn",Http] params:parmDic]; + +} + +//应急就医 +- (void)getSOSDoctorRecordList:(NSMutableDictionary *)parmDic { + + [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/initUserOrderPage",Http] params:parmDic]; + +} + +- (void)getSOSDoctorDetailInfo:(NSMutableDictionary *)parmDic { + + //GET https://cqyt.test.yg.icdat.cn/health-emergency/api/emergency/order/orderThrough?id=1744265549623332865 HTTP/1.1 + [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/getOrderById",Http] params:parmDic]; + +} + +//应急小结 +- (void)getSOSSmallSumData:(NSMutableDictionary *)parmDic { + // + [httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/orderThrough",Http] params:parmDic]; + +} @end diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h index 26b9806..3a02ddc 100644 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.h @@ -1,6 +1,6 @@ // // SDGETHealthTokenManager.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2024/1/4. // diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m index 0dfab49..aacb864 100644 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/SDGETHealthTokenManager.m @@ -1,6 +1,6 @@ // // SDGETHealthTokenManager.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2024/1/4. // diff --git a/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.h b/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.h index 7db5257..21bdfca 100644 --- a/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.h +++ b/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.h @@ -1,6 +1,6 @@ // // ESCTUIManager.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/16. // diff --git a/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m b/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m index b13398b..17f6a13 100644 --- a/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m +++ b/XinjiangProject/XinjiangProject/Manager/TUIManager/ESCTUIManager.m @@ -1,6 +1,6 @@ // // ESCTUIManager.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/16. // diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m index 8f52968..7b5bf97 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m @@ -7,7 +7,7 @@ #import "AppDelegate+AppService.h" #import "HQBaseTabBarController.h" -#import "HQLoginViewController.h" +#import "XJLoginViewController.h" #import #import @@ -314,7 +314,7 @@ self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; self.window.backgroundColor = KWhiteColor; - HQLoginViewController * loginvc = [[HQLoginViewController alloc] init]; + XJLoginViewController * loginvc = [[XJLoginViewController alloc] init]; HQBaseNavigationController * nav = [[HQBaseNavigationController alloc] initWithRootViewController:loginvc]; self.window.rootViewController = nav; [self.window makeKeyAndVisible]; diff --git a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h b/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h index 0f5be9c..f2df855 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h +++ b/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.h @@ -1,6 +1,6 @@ // // DownPDFFileVC.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m b/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m index 0eeeb9a..13814f2 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m +++ b/XinjiangProject/XinjiangProject/Project/Base/DownPDFFileVC.m @@ -1,6 +1,6 @@ // // DownPDFFileVC.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m b/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m index 3f3f119..533a057 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m +++ b/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m @@ -7,13 +7,12 @@ #import "HQBaseTabBarController.h" #import "HQTabBar.h" -#import "MyCenterViewController.h" +#import "XJMyCenterViewController.h" #import "ChatListViewController.h" //主控制器 #import "QuestionViewController.h" -#import "MyCenterViewController.h" -#import "SosCenterViewController.h" -#import "HeartBadViewController.h" +#import "XJSosCenterViewController.h" +#import "MonitoringWarchViewController.h" //干预二期 @@ -78,14 +77,14 @@ [self setupChildViewController:questionVC title:@"咨询" imageName:@"Question_normal_icon" seleceImageName:@"Question_selected_icon"]; - SosCenterViewController * sosVC = [[SosCenterViewController alloc]init]; + XJSosCenterViewController * sosVC = [[XJSosCenterViewController alloc]init]; [self setupChildViewController:sosVC title:@"就医" imageName:@"Question_normal_icon" seleceImageName:@"Question_selected_icon"]; - HeartBadViewController * jianceVC = [[HeartBadViewController alloc]init]; + MonitoringWarchViewController * jianceVC = [[MonitoringWarchViewController alloc]init]; [self setupChildViewController:jianceVC title:@"监测" imageName:@"Question_normal_icon" seleceImageName:@"Question_selected_icon"]; - MyCenterViewController * centerVC = [[MyCenterViewController alloc] init]; + XJMyCenterViewController * centerVC = [[XJMyCenterViewController alloc] init]; [self setupChildViewController:centerVC title:@"我的" imageName:@"mine_normal" seleceImageName:@"mine_selected"]; diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m b/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m index ff3e492..4acc5b3 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Base/HQBaseViewController.m @@ -6,7 +6,7 @@ // #import "HQBaseViewController.h" -#import "HQLoginViewController.h" +#import "XJLoginViewController.h" @interface HQBaseViewController () diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.h index 0e3fbc8..8bfbca3 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.h @@ -1,6 +1,6 @@ // // CustomSystemEvaluateModel.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.m index 829b6fc..82012ae 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomSystemEvaluateModel.m @@ -1,6 +1,6 @@ // // CustomSystemEvaluateModel.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h index 9c4a965..a7c309a 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.h @@ -1,6 +1,6 @@ // // CustomTUIHistoryModel.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/21. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.m index afd93e7..60ec048 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTUIHistoryModel.m @@ -1,6 +1,6 @@ // // CustomTUIHistoryModel.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/21. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.h index aec4837..ab71957 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.h @@ -1,6 +1,6 @@ // // CustomTextModel.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.m index d714621..6e996eb 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomModel/CustomTextModel.m @@ -1,6 +1,6 @@ // // CustomTextModel.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.h index 7dbbf5b..efd953a 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.h @@ -1,6 +1,6 @@ // // CustomTUIModel.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/17. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.m index a1595b5..b21a362 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/CustomTUIModel.m @@ -1,6 +1,6 @@ // // CustomTUIModel.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/17. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h index 57ebc22..ca8517e 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.h @@ -1,6 +1,6 @@ // // CustomTUIBaseMessageController.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m index b8c6970..c89a14d 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIBaseMessageController.m @@ -1,6 +1,6 @@ // // CustomTUIBaseMessageController.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.h index f249abd..bbb9970 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.h @@ -1,6 +1,6 @@ // // CustomTUIHistoryTable.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.m index 1dea67f..3285bb0 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/VC/CustomTUIHistoryTable.m @@ -1,6 +1,6 @@ // // CustomTUIHistoryTable.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.h index 6eea7d6..1d7d999 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.h @@ -1,6 +1,6 @@ // // CustomAudioCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.m index bb10684..81c2f13 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomAudioCell.m @@ -1,6 +1,6 @@ // // CustomAudioCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.h index ace5b7a..34fe71a 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.h @@ -1,6 +1,6 @@ // // CustomDoctorIDTableViewCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/7/5. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.m index 86ce2c3..e607076 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomDoctorIDTableViewCell.m @@ -1,6 +1,6 @@ // // CustomDoctorIDTableViewCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/7/5. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.h index 21a0c4d..6f1592d 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.h @@ -1,6 +1,6 @@ // // CustomHealthFileVideoCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.m index f334c68..f677e6f 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthFileVideoCell.m @@ -1,6 +1,6 @@ // // CustomHealthFileVideoCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.h index 14b1cac..b1dc626 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.h @@ -1,6 +1,6 @@ // // CustomHealthReportVideoCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.m index fed2751..d037b9a 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomHealthReportVideoCell.m @@ -1,6 +1,6 @@ // // CustomHealthReportVideoCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h index 0142b26..2ab9adf 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.h @@ -1,6 +1,6 @@ // // CustomMapMessageCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m index 08ad66b..17437da 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomMapMessageCell.m @@ -1,6 +1,6 @@ // // CustomMapMessageCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.h index c0c4b33..a38d86e 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.h @@ -1,6 +1,6 @@ // // CustomReviceTableViewCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/7/5. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.m index da470e9..1c4e731 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomReviceTableViewCell.m @@ -1,6 +1,6 @@ // // CustomReviceTableViewCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/7/5. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.h index 0380026..1080632 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.h @@ -1,6 +1,6 @@ // // CustomSystemImageCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.m index 58e64f5..18dec47 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemImageCell.m @@ -1,6 +1,6 @@ // // CustomSystemImageCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.h index 545d60b..f778c29 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.h @@ -1,6 +1,6 @@ // // CustomSystemTextCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.m index 5a54655..3a1f52c 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemTextCell.m @@ -1,6 +1,6 @@ // // CustomSystemTextCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.h index ca5f9f1..9f7e461 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.h @@ -1,6 +1,6 @@ // // CustomSystemVideoCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.m index c4ed379..edee2b6 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cell/CustomSystemVideoCell.m @@ -1,6 +1,6 @@ // // CustomSystemVideoCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.h b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.h index 5fec76d..f3f8cc8 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.h +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.h @@ -1,6 +1,6 @@ // // CustomMapMessageCellData.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m index 3632559..70dbfa8 100644 --- a/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m +++ b/XinjiangProject/XinjiangProject/Project/CustomTUIChat/cellData/CustomMapMessageCellData.m @@ -1,6 +1,6 @@ // // CustomMapMessageCellData.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.h index 5572c6f..0b8653f 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.h +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.h @@ -1,6 +1,6 @@ // // IMUserInfoModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.m index 0df806a..c6b1ee9 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/Model/IMUserInfoModel.m @@ -1,6 +1,6 @@ // // IMUserInfoModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h new file mode 100644 index 0000000..8c739a5 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.h @@ -0,0 +1,16 @@ +// +// XJLoginFoundPasswordViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/5/22. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJLoginFoundPasswordViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m new file mode 100644 index 0000000..2efe4ac --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m @@ -0,0 +1,211 @@ +// +// XJLoginFoundPasswordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/5/22. +// + +#import "XJLoginFoundPasswordViewController.h" +#import "XJLoginSetPasswordViewController.h" +#import "LVKeyboard.h" +#import "MQTextField.h" +@interface XJLoginFoundPasswordViewController () + +@property (nonatomic, strong)UITextField * nameTextFild; +@property (nonatomic, strong)UITextField * phoneTextFild; +@property (nonatomic, strong)MQTextField * codeTextFild; +@property (nonatomic, strong)UIButton * codeButton; +@property (nonatomic, strong) LVKeyboard *keyboard; + +@end + +@implementation XJLoginFoundPasswordViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + self.isHidenNaviBar = false; + self.navigationItem.title = @"修改密码"; + // Do any additional setup after loading the view. + self.view.backgroundColor = UIColorHex(#E0E0E0); + [self createUI]; +} + +- (void)createUI { + + + //初始化键盘 + LVKeyboard *keyboard = [[LVKeyboard alloc] init]; + keyboard.delegate = self; + self.keyboard = keyboard; + + UIView * topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(151))]; + topView.backgroundColor = KWhiteColor; + [self.view addSubview:topView]; + + + + UIView * nameLeft = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 112, kRealValue(50))]; + UILabel * nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 80, kRealValue(50))]; + nameLabel.text = @"用户姓名"; + nameLabel.textAlignment = NSTextAlignmentLeft; + nameLabel.font = SYSTEMFONT(13); + nameLabel.textColor = UIColorHex(#666666); + [nameLeft addSubview:nameLabel]; + + + self.nameTextFild = [[UITextField alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(50))]; + self.nameTextFild.placeholder = @"请输入用户姓名"; + self.nameTextFild.returnKeyType = UIReturnKeyDone; + self.nameTextFild.font = [UIFont systemFontOfSize:14]; + self.nameTextFild.backgroundColor = KWhiteColor; + self.nameTextFild.leftView = nameLeft; + self.nameTextFild.leftViewMode = UITextFieldViewModeAlways; + self.nameTextFild.font = SYSTEMFONT(14); + [topView addSubview:self.nameTextFild]; + + UIView * linv = [[UIView alloc] initWithFrame:CGRectMake(16, self.nameTextFild.bottom, kScreenWidth - 32, 1)]; + linv.backgroundColor = UIColorHex(#E0E0E0); + [topView addSubview:linv]; + + UIView * codeLeft = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 112, kRealValue(50))]; + UILabel * codeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 90, kRealValue(50))]; + codeLabel.text = @"身份证号"; + codeLabel.textAlignment = NSTextAlignmentLeft; + codeLabel.font = SYSTEMFONT(13); + codeLabel.textColor = UIColorHex(#666666); + + [codeLeft addSubview:codeLabel]; + + self.codeTextFild = [[MQTextField alloc] initWithFrame:CGRectMake(0, self.nameTextFild.bottom+1, kScreenWidth, kRealValue(50))]; + self.codeTextFild.placeholder = @"请输入用户身份证号"; + self.codeTextFild.font = [UIFont systemFontOfSize:14]; + self.codeTextFild.backgroundColor = KWhiteColor; + self.codeTextFild.inputView = self.keyboard; + self.codeTextFild.delegate = self; + self.codeTextFild.leftView = codeLeft; + self.codeTextFild.leftViewMode = UITextFieldViewModeAlways; + [topView addSubview:self.codeTextFild]; + + UIView * linvCard = [[UIView alloc] initWithFrame:CGRectMake(16, self.codeTextFild.bottom, kScreenWidth - 32, 1)]; + linvCard.backgroundColor = UIColorHex(#E0E0E0); + [topView addSubview:linvCard]; + + + UIView * phoneLeft = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 112, kRealValue(50))]; + UILabel * phoneLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 90, kRealValue(50))]; + phoneLabel.text = @"手机号"; + phoneLabel.textAlignment = NSTextAlignmentLeft; + phoneLabel.font = SYSTEMFONT(13); + phoneLabel.textColor = UIColorHex(#666666); + [phoneLeft addSubview:phoneLabel]; + + self.phoneTextFild = [[UITextField alloc] initWithFrame:CGRectMake(0, self.codeTextFild.bottom+1, kScreenWidth, kRealValue(50))]; + self.phoneTextFild.placeholder = @"请输入用户手机号"; + self.phoneTextFild.font = [UIFont systemFontOfSize:14]; + self.phoneTextFild.backgroundColor = KWhiteColor; + self.phoneTextFild.leftView = phoneLeft; + self.phoneTextFild.keyboardType = UIKeyboardTypeNumberPad; + self.phoneTextFild.leftViewMode = UITextFieldViewModeAlways; + [topView addSubview:self.phoneTextFild]; + + UIView * phoneLinv = [[UIView alloc] initWithFrame:CGRectMake(16, self.phoneTextFild.bottom, kScreenWidth - 32, 1)]; + phoneLinv.backgroundColor = UIColorHex(#E0E0E0); + [topView addSubview:phoneLinv]; + + + UIButton * loginBtn = [[UIButton alloc] initWithFrame:CGRectMake(48,self.phoneTextFild.bottom+58, kScreenWidth-96, 48)]; + [loginBtn setTitle:@"确定" forState:UIControlStateNormal ]; + loginBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:14]; + [loginBtn setBackgroundColor:UIColorHex(#21BEBD)]; + loginBtn.layer.cornerRadius = 20; + loginBtn.layer.masksToBounds = true; + [loginBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; + [loginBtn addTarget:self action:@selector(sureFoundAction) forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:loginBtn]; +} + +#pragma mark - 确定点击 +- (void)sureFoundAction { + + + if (ValidStr(self.nameTextFild.text)) { + [EasyTextView showErrorText:@"请输入用户姓名"]; + return; + } + if (ValidStr(self.codeTextFild.text)) { + [EasyTextView showErrorText:@"请输入用户身份证号"]; + return; + } + if (ValidStr(self.phoneTextFild.text)) { + [EasyTextView showErrorText:@"请输入用户手机号"]; + return; + } + [self showMBProgressHUDWithString:@"信息验证中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:self.nameTextFild.text forKey:@"realname"]; + [parmDic setObject:self.codeTextFild.text forKey:@"idCard"]; + [parmDic setObject:self.phoneTextFild.text forKey:@"phone"]; + + JKCQAPI * chageApi = [[JKCQAPI alloc] init:self tag:@"CHANGEAPI" NeedToken:@""]; + + [chageApi postSetUserPassword:parmDic]; + + +} + +#pragma mark -网络请求处理 +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"CHANGEAPI"]) { + + [self hiddenAllMBProgressHUD]; + NSString * result = response; + + XJLoginSetPasswordViewController * password = [[XJLoginSetPasswordViewController alloc] init]; + password.result = result; + [self.navigationController pushViewController:password animated:YES]; + } + +} + + +-(BOOL)textFieldShouldBeginEditing:(UITextField *)textField { + + if(textField == self.codeTextFild) { + + self.codeTextFild.inputView = self.keyboard; + } + return YES; + +} + +- (void)keyboard:(LVKeyboard *)keyboard didClickDeleteButton:(UIButton *)deleteBtn string:(NSMutableString *)string { + self.codeTextFild.text = string; +} + +- (void)keyboard:(LVKeyboard *)keyboard didClickTextButton:(UIButton *)textBtn string:(NSMutableString *)string { + self.codeTextFild.text = string; +} + + +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { + [self.codeTextFild resignFirstResponder]; +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h new file mode 100644 index 0000000..12a4813 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.h @@ -0,0 +1,18 @@ +// +// XJLoginSetPasswordViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/5/22. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJLoginSetPasswordViewController : HQBaseViewController + +@property (nonatomic, copy) NSString * result; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m new file mode 100644 index 0000000..2d6243e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginSetPasswordViewController.m @@ -0,0 +1,229 @@ +// +// XJLoginSetPasswordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/5/22. +// + +#import "XJLoginSetPasswordViewController.h" +#import "RSAObjC.h" +#import "XJLoginViewController.h" + +@interface XJLoginSetPasswordViewController () + +@property (nonatomic, strong) UITextField * phoneTextFild; +@property (nonatomic, strong) UITextField * codeTextFild; + +@property (nonatomic, strong) UIButton * toggleButton; +@property (nonatomic, strong) UIButton * suretoggleButton; + +@end + +@implementation XJLoginSetPasswordViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.navigationItem.title = @"设置密码"; + self.view.backgroundColor = UIColorHex(#EFEFEF); + [self createUI]; +} + +- (void)createUI { + + UIView * topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(100))]; + topView.backgroundColor = KWhiteColor; + [self.view addSubview:topView]; + + + + UIView * phoneLeft = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 112, kRealValue(50))]; + UILabel * phoneLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 80, kRealValue(50))]; + phoneLabel.text = @"新密码"; + phoneLabel.textAlignment = NSTextAlignmentLeft; + phoneLabel.font = SYSTEMFONT(13); + phoneLabel.textColor = UIColorHex(#666666); + [phoneLeft addSubview:phoneLabel]; + + + self.phoneTextFild = [[UITextField alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(50))]; + self.phoneTextFild.placeholder = @"请输入新密码"; + self.phoneTextFild.returnKeyType = UIReturnKeyDone; + self.phoneTextFild.font = [UIFont systemFontOfSize:14]; + self.phoneTextFild.backgroundColor = KWhiteColor; + self.phoneTextFild.leftView = phoneLeft; + self.phoneTextFild.secureTextEntry = YES; + self.phoneTextFild.leftViewMode = UITextFieldViewModeAlways; + self.phoneTextFild.font = SYSTEMFONT(14); + [self.view addSubview:self.phoneTextFild]; + + + self.toggleButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [self.toggleButton setImage:[UIImage imageNamed:@"eye"] forState:UIControlStateNormal]; + [self.toggleButton setImage:[UIImage imageNamed:@"eye.slash"] forState:UIControlStateSelected]; + self.toggleButton.frame = CGRectMake(0, 5, 30,30); + [self.toggleButton addTarget:self action:@selector(togglePasswordVisibility) forControlEvents:UIControlEventTouchUpInside]; + // 创建一个容器视图来包含按钮，并增加边距 + UIView *rightView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; + [rightView addSubview:self.toggleButton]; + + // 调整按钮在容器视图中的位置，增加边距 + self.toggleButton.centerX = rightView.centerX; + + self.toggleButton.center = CGPointMake(rightView.frame.size.width - self.toggleButton.frame.size.width / 2, rightView.frame.size.height / 2); + self.phoneTextFild.rightView = rightView; + self.phoneTextFild.rightViewMode = UITextFieldViewModeAlways; + + UIView * linv = [[UIView alloc] initWithFrame:CGRectMake(16, self.phoneTextFild.bottom, kScreenWidth - 32, 1)]; + linv.backgroundColor = UIColorHex(#E0E0E0); + [self.view addSubview:linv]; + + UIView * codeLeft = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 112, kRealValue(50))]; + UILabel * codeLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 90, kRealValue(50))]; + codeLabel.text = @"确认密码"; + codeLabel.textAlignment = NSTextAlignmentLeft; + codeLabel.font = SYSTEMFONT(13); + codeLabel.textColor = UIColorHex(#666666); + [codeLeft addSubview:codeLabel]; + + self.codeTextFild = [[UITextField alloc] initWithFrame:CGRectMake(0, self.phoneTextFild.bottom+1, kScreenWidth, kRealValue(50))]; + self.codeTextFild.placeholder = @"请输入新密码"; + self.codeTextFild.font = [UIFont systemFontOfSize:14]; + self.codeTextFild.backgroundColor = KWhiteColor; + self.codeTextFild.leftView = codeLeft; + self.codeTextFild.secureTextEntry = YES; + self.codeTextFild.leftViewMode = UITextFieldViewModeAlways; + [self.view addSubview:self.codeTextFild]; + + + self.suretoggleButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [self.suretoggleButton setImage:[UIImage imageNamed:@"eye"] forState:UIControlStateNormal]; + [self.suretoggleButton setImage:[UIImage imageNamed:@"eye.slash"] forState:UIControlStateSelected]; + self.suretoggleButton.frame = CGRectMake(0, 5, 30,30); + [self.suretoggleButton addTarget:self action:@selector(sureTogglePasswordVisibility) forControlEvents:UIControlEventTouchUpInside]; + // 创建一个容器视图来包含按钮，并增加边距 + UIView *coderightView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; + [coderightView addSubview:self.suretoggleButton]; + + // 调整按钮在容器视图中的位置，增加边距 + self.suretoggleButton.centerX = coderightView.centerX; + self.codeTextFild.rightView = coderightView; + self.codeTextFild.rightViewMode = UITextFieldViewModeAlways; + + UILabel * passwordLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15), topView.bottom + kRealValue(8) , kScreenWidth - kRealValue(30), 42)]; + passwordLabel.textColor = UIColorHex(#666666); + passwordLabel.text = @"温馨提示：密码需要为12-32位(包含数字、大写、小写字母、特殊字符)"; + passwordLabel.numberOfLines = 2; + passwordLabel.font =MEDIUMFONT(14); + [passwordLabel sizeToFit]; +// NSMutableAttributedString * attString = [HQCommonUtils firstString:@"请为您的账号" firstColor:UIColorHex(#666666) firstSize:14 secondString:@"zhangsan" secondColor:UIColorHex(#333333) secondSize:14 thirdString:@"设置一个新密码" thirdColor:UIColorHex(#666666) thirdSize:14]; +// passwordLabel.attributedText = attString ; +// passwordLabel.textAlignment = NSTextAlignmentCenter; +// [topView addSubview:passwordLabel]; + [self.view addSubview:passwordLabel]; + + UIButton * loginBtn = [[UIButton alloc] initWithFrame:CGRectMake(48,passwordLabel.bottom+58, kScreenWidth-96, 48)]; + [loginBtn setTitle:@"确定" forState:UIControlStateNormal ]; + loginBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:14]; + [loginBtn setBackgroundColor:UIColorHex(#21BEBD)]; + loginBtn.layer.cornerRadius = 20; + loginBtn.layer.masksToBounds = true; + [loginBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; + [loginBtn addTarget:self action:@selector(sureFoundAction) forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:loginBtn]; +} + +#pragma mark:重新设置密码 +- (void)sureFoundAction { + + [self.phoneTextFild resignFirstResponder]; + [self.codeTextFild resignFirstResponder]; + + if (ValidStr(self.phoneTextFild.text) || ValidStr(self.codeTextFild.text)) { + [EasyTextView showErrorText:@"请输入新密码"]; + return; + } + if (isValidPassword(self.phoneTextFild.text)) { + + } else { + [EasyTextView showErrorText:@"请按照密码规则,请重新输入"]; + return; + } + if ( ![self.phoneTextFild.text isEqualToString:self.codeTextFild.text]) { + [EasyTextView showErrorText:@"两次输入密码不一致,请重新输入"]; + return; + } + + NSString * publish_key = @" MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmZfR/bA9X3vp86y1aEpvwzXJYKRRF1fLau2+05/ZtaITLpV8bhkmSf3neSy/Q9gAdvG75Fr73E+GWE+K5b0BpvIS1jDGo319+PpZR39SaZTKZ27XFXrosmJTZutN79t819HS1VseleunHAFgMVufE9U5jP6LGzl/wbkSy01GhzwIDAQAB"; + + // 原始数据，要加密的字符串 + NSString *originalString = self.phoneTextFild.text; + + // RSA 加密，使用字符串格式的公钥私钥加密解密, RSAPublickKey 为公钥字符串(NSString 格式) + NSString *encryptStr = [RSAObjC encrypt:originalString PublicKey:publish_key]; + + [self showMBProgressHUDWithString:@"密码重置中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:encryptStr forKey:@"newPassword"]; + [parmDic setObject:encryptStr forKey:@"newPasswordConfirm"]; + [parmDic setObject:self.result forKey:@"resetCode"]; + + JKCQAPI * chageApi = [[JKCQAPI alloc] init:self tag:@"CHANGEAPI" NeedToken:@""]; + + [chageApi postResetUserNewPassword:parmDic]; + + +} + + +BOOL isValidPassword(NSString *password) { + // 定义正则表达式 + NSString *pattern = @"^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*(),.?\":{}|<>]).{12,32}$"; + + // 创建NSPredicate对象 + NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", pattern]; + + // 使用NSPredicate对象进行判断 + return [predicate evaluateWithObject:password]; +} + +#pragma mark -网络请求处理 +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"CHANGEAPI"]) { + [self hiddenAllMBProgressHUD]; + [self.navigationController popToRootViewControllerAnimated:YES]; + [self showMBProgressHUDOnlyWithString:response]; + } + +} + + +- (void)togglePasswordVisibility { + self.phoneTextFild.secureTextEntry = !self.phoneTextFild.secureTextEntry; + self.toggleButton.selected = !self.toggleButton.selected; +} + +- (void)sureTogglePasswordVisibility { + self.codeTextFild.secureTextEntry = !self.codeTextFild.secureTextEntry; + self.suretoggleButton.selected = !self.suretoggleButton.selected; +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h new file mode 100644 index 0000000..ea06b76 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.h @@ -0,0 +1,16 @@ +// +// XJLoginViewController.h +// healthQuestion +// +// Created by xulei on 2022/8/16. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJLoginViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m new file mode 100644 index 0000000..4f3f8df --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m @@ -0,0 +1,576 @@ +// +// HQLoginViewController.m +// healthQuestion +// +// Created by xulei on 2022/8/16. +// + +#import "XJLoginViewController.h" +#import "TUIC2CChatViewController.h" +#import "XJLoginFoundPasswordViewController.h" +#import "IMUserInfoModel.h" +#import "RSAObjC.h" +#import "XJMineCenterUserModel.h" +#import "ADJumpViewController.h" +#import "XJRegisterViewController.h" +#import "LVKeyboard.h" +#import "MQTextField.h" +@interface XJLoginViewController () + +@property (nonatomic, strong) UITextField * userNameField; + +@property (nonatomic, strong) MQTextField * passwordField; + +@property (nonatomic, strong) UIButton * logoBtn; + +@property (nonatomic, strong) UIView * loginView; + +@property (nonatomic, strong) UIButton * privacyPolicyBtn; + +@property (nonatomic, strong) UIButton * agreenBtn; + +@property (nonatomic, strong) IMUserInfoModel * model ; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, strong) UIButton * regisBtn; + +@property (nonatomic, strong) LVKeyboard *keyboard; + +@property (nonatomic, strong) UIButton *toggleButton; + +@end + +@implementation XJLoginViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + _dataArray = [[NSMutableArray alloc] init]; + } + return _dataArray; +} + + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = YES; + self.view.backgroundColor = KWhiteColor; + [self createUI]; + [self createData]; +// [self ishiderRegisData]; + //初始化键盘 + LVKeyboard *keyboard = [[LVKeyboard alloc] init]; + keyboard.delegate = self; + self.keyboard = keyboard; + + +} + +- (void)createUI { + + UIImageView * topBackImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(243))]; + topBackImg.image = IMAGE_NAMED(@"loginTopBimg"); + topBackImg.userInteractionEnabled = true; + [self.view addSubview:topBackImg]; + + UIImageView * cenetrImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, kRealValue(70), kRealValue(68), kRealValue(68))]; + cenetrImg.centerX = self.view.centerX; + cenetrImg.image = IMAGE_NAMED(@"login_icon"); + cenetrImg.userInteractionEnabled = true; + [self.view addSubview:cenetrImg]; + + UIButton * homeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + homeBtn.frame = CGRectMake(kRealValue(15), kRealValue(40),kRealValue(100), 41); + [homeBtn setTitle:@"< 去首页" forState:UIControlStateNormal]; + [homeBtn.titleLabel setFont:BOLDSYSTEMFONT(14)]; + [homeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [homeBtn addTarget:self action:@selector(backHomeAction) forControlEvents:UIControlEventTouchUpInside]; + [topBackImg addSubview:homeBtn]; + + UIImageView *titleImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, cenetrImg.bottom + kRealValue(20), kRealValue(109), kRealValue(24))]; + titleImg.centerX = self.view.centerX; + titleImg.image = IMAGE_NAMED(@"loginTitle_Img"); + [self.view addSubview:titleImg]; +// + UIView *loginView = [[UIView alloc]init]; + loginView.frame = CGRectMake(0, titleImg.bottom + kRealValue(41), kScreenWidth, kScreenHeight - titleImg.bottom - kRealValue(41)); + [self.view addSubview:loginView]; + loginView.backgroundColor = KWhiteColor; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:loginView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(20, 20)]; + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.path = maskPath.CGPath; + loginView.layer.mask = maskLayer; + self.loginView = loginView; +// + UITextField *accountField = [[UITextField alloc]init]; + accountField.frame = CGRectMake(kRealValue(35), kRealValue(36), loginView.width - kRealValue(70), 40); + accountField.placeholder = @"请输入用户名"; + accountField.font = BOLDSYSTEMFONT(14); + accountField.textColor = CFontColor1; + self.userNameField = accountField; + self.userNameField.backgroundColor = UIColorHex(#EEEEEE); + self.userNameField.layer.cornerRadius = 20; + self.userNameField.layer.masksToBounds = true; + UIView * leftview = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 20, 40)]; + self.userNameField.leftView = leftview; + self.userNameField.leftViewMode = UITextFieldViewModeAlways; + [loginView addSubview:accountField ]; +// +// + MQTextField * passwordField = [[MQTextField alloc]init]; + passwordField.frame = CGRectMake(kRealValue(35), accountField.bottom + kRealValue(19), accountField.width, accountField.height); + passwordField.placeholder = @"请输入密码"; + passwordField.font = BOLDSYSTEMFONT(14); + passwordField.textColor = CFontColor1; + passwordField.backgroundColor = UIColorHex(#EEEEEE); + passwordField.secureTextEntry = YES; + self.passwordField = passwordField; + self.passwordField.leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 20, 40)]; + self.passwordField.leftViewMode = UITextFieldViewModeAlways; + self.passwordField.layer.cornerRadius = 20; + self.passwordField.layer.masksToBounds = true; + self.passwordField.delegate = self; + self.passwordField.inputView = self.keyboard; + + self.toggleButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [self.toggleButton setImage:[UIImage imageNamed:@"eye"] forState:UIControlStateNormal]; + [self.toggleButton setImage:[UIImage imageNamed:@"eye.slash"] forState:UIControlStateSelected]; + self.toggleButton.frame = CGRectMake(0, 5, 30,30); + [self.toggleButton addTarget:self action:@selector(togglePasswordVisibility) forControlEvents:UIControlEventTouchUpInside]; + // 创建一个容器视图来包含按钮，并增加边距 + UIView *rightView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; + [rightView addSubview:self.toggleButton]; + + // 调整按钮在容器视图中的位置，增加边距 + self.toggleButton.center = CGPointMake(rightView.frame.size.width - self.toggleButton.frame.size.width / 2, rightView.frame.size.height / 2); + self.passwordField.rightView = rightView; + self.passwordField.rightViewMode = UITextFieldViewModeAlways; + + [loginView addSubview:passwordField]; + + + + + UIButton *loginBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + loginBtn.frame = CGRectMake(kRealValue(35), self.passwordField.bottom + kRealValue(19), WIDTH - kRealValue(70), 41); + [loginBtn setTitle:@"登录" forState:UIControlStateNormal]; + [loginBtn.titleLabel setFont:BOLDSYSTEMFONT(14)]; + [loginBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [loginBtn setBackgroundImage:[UIImage imageNamed:@"loginBtn_img"] forState:UIControlStateNormal]; + [loginBtn addTarget:self action:@selector(toClickFootBtn:) forControlEvents:UIControlEventTouchUpInside]; + [loginView addSubview:loginBtn]; + + UIButton * foundPasswordBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + foundPasswordBtn.frame = CGRectMake(kRealValue(35), loginBtn.bottom + kRealValue(10), WIDTH - kRealValue(70), 20); + [foundPasswordBtn setTitle:@"找回密码" forState:UIControlStateNormal]; + foundPasswordBtn.titleLabel.font = MEDIUMFONT(14); + [foundPasswordBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal]; + [foundPasswordBtn addTarget:self action:@selector(foundUserPasswordAction) forControlEvents:UIControlEventTouchUpInside]; + [loginView addSubview:foundPasswordBtn]; + + + UIButton * regisBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + regisBtn.frame = CGRectMake(kRealValue(35), foundPasswordBtn.bottom + kRealValue(20), kScreenWidth - kRealValue(70), 20); + [regisBtn setTitle:@"注册" forState:UIControlStateNormal]; + self.regisBtn = regisBtn; + regisBtn.titleLabel.font = MEDIUMFONT(14); + self.regisBtn.hidden = true; + [regisBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal]; + [regisBtn addTarget:self action:@selector(regisAction) forControlEvents:UIControlEventTouchUpInside]; + [loginView addSubview:regisBtn]; + + [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"LOGINAgree"]; + [[NSUserDefaults standardUserDefaults] synchronize]; + + NSUserDefaults * agreeDefaul = [NSUserDefaults standardUserDefaults]; + + NSString * agree = [agreeDefaul objectForKey:@"LOGINAgree"]; + + self.agreenBtn = [UIButton buttonWithType:UIButtonTypeCustom]; + self.agreenBtn.frame = CGRectMake(kRealValue(28), self.view.bottom - kRealValue(45) - SafetyAreaHeight, kRealValue(20), kRealValue(20)); + [self.agreenBtn addTarget:self action:@selector(agreeProtocolAction:) forControlEvents:UIControlEventTouchUpInside]; + [self.agreenBtn setImage:IMAGE_NAMED(@"login_nomalProtocol") forState:UIControlStateNormal]; + [self.agreenBtn setImage:IMAGE_NAMED(@"login_selectProtocol") forState:UIControlStateSelected]; + if ([agree intValue] == 1) { + self.agreenBtn.selected = true; + }else + { + self.agreenBtn.selected = false; + } + [self.view addSubview:self.agreenBtn]; + + + //隐私 + YYLabel * yslabel = [[YYLabel alloc] initWithFrame:CGRectMake(self.agreenBtn.right + kRealValue(5) ,self.agreenBtn.top , kScreenWidth - self.agreenBtn.right - kRealValue(47), 20)]; + [self.view addSubview:yslabel]; + yslabel.numberOfLines = 0; + + NSString *string = @"已阅读并同意《用户协议》、《隐私政策》"; + NSMutableAttributedString *attributed = [[NSMutableAttributedString alloc] initWithString:string]; + [attributed setAttribute:NSForegroundColorAttributeName value:UIColorHex(#3390FF) range:[string rangeOfString:@"《用户协议》"]]; + [attributed setAttribute:NSForegroundColorAttributeName value:UIColorHex(#3390FF) range:[string rangeOfString:@"《隐私政策》"]]; +// [attributed setAttribute:NSForegroundColorAttributeName value:UIColorHex(#3390FF) range:[string rangeOfString:@"《相关法律说明》"]]; + + YYTextHighlight * protocolHightlight = [[YYTextHighlight alloc] init]; + protocolHightlight.userInfo = @{@"协议":@"《用户协议》"}; + [protocolHightlight setColor:UIColorHex(#3390FF)]; + [attributed setTextHighlight:protocolHightlight range:[string rangeOfString:@"《用户协议》"]]; + + YYTextHighlight * layHightlight = [[YYTextHighlight alloc] init]; + layHightlight.userInfo = @{@"隐私":@"《隐私政策》"}; + [layHightlight setColor:UIColorHex(#3390FF)]; + [attributed setTextHighlight:layHightlight range:[string rangeOfString:@"《隐私政策》"]]; + +// +// YYTextHighlight * shuoHightlight = [[YYTextHighlight alloc] init]; +// shuoHightlight.userInfo = @{@"说明":@"《相关法律说明》"}; +// [shuoHightlight setColor:UIColorHex(#3390FF)]; +// [attributed setTextHighlight:shuoHightlight range:[string rangeOfString:@"《相关法律说明》"]]; + + attributed.lineSpacing = 3; + attributed.paragraphSpacing = 5; + yslabel.attributedText = attributed; + + yslabel.highlightTapAction = ^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + NSString *string = [text.string substringWithRange:range]; + if ([string containsString:@"用户协议"]){ + if (self.dataArray.count <= 0) { + [EasyTextView showErrorText:@"暂无用户协议"]; + return; + } + for (XJMineCenterUserModel * model in self.dataArray) { + + if ([model.value integerValue] == 1) { + + ADJumpViewController * webVC= [[ADJumpViewController alloc] init]; + webVC.webTitle = @"用户协议"; + webVC.webUrl = [NSString stringWithFormat:@"%@%@",IntervenH5,model.text]; + [self.navigationController pushViewController:webVC animated:YES]; + } + + } + + } + if ([string containsString:@"隐私政策"]){ + if (self.dataArray.count <= 0) { + [EasyTextView showErrorText:@"暂无隐私政策"]; + return; + } + for (XJMineCenterUserModel * model in self.dataArray) { + if ([model.value integerValue] == 2) { + + ADJumpViewController * webVC= [[ADJumpViewController alloc] init]; + webVC.webTitle = @"隐私政策"; + webVC.webUrl = [NSString stringWithFormat:@"%@%@",IntervenH5,model.text]; + [self.navigationController pushViewController:webVC animated:YES]; + } + } + } + if ([string containsString:@"相关法律说明"]){ + for (XJMineCenterUserModel * model in self.dataArray) { + if ([model.value integerValue] == 3) { + + ADJumpViewController * webVC= [[ADJumpViewController alloc] init]; + webVC.webTitle = @"相关法律说明"; + webVC.webUrl = [NSString stringWithFormat:@"%@%@",IntervenH5,model.text]; + [self.navigationController pushViewController:webVC animated:YES]; + } + } + } + }; + +} +- (void)createData { + + JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + + [agreeAPI getUserAgreementPrivacy:nil]; + +} + + +#pragma mark - ACTION +- (void)toClickFootBtn:(UIButton *)button{ + + if (self.agreenBtn.selected == false) { + [EasyTextView showErrorText:@"请选阅读并同意用户服务协议与隐私"]; + return;; + } + + + + if (self.userNameField.text.length < 1) { + [EasyTextView showErrorText:@"请输入用户名"]; + return;; + } + + if (self.passwordField.text.length < 12 || self.passwordField.text.length > 32) { + + + + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"密码不安全,请先修改密码" preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { + + }]; + UIAlertAction *sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { + + XJLoginFoundPasswordViewController * modifVC = [[XJLoginFoundPasswordViewController alloc] init]; + [self.navigationController pushViewController:modifVC animated:YES]; + + }]; + [alertController addAction:cancelAction]; + [alertController addAction:sureAction]; + + [self presentViewController:alertController animated:YES completion:nil]; + + + return;; + } + + if (self.passwordField.text.length < 1) { + [EasyTextView showErrorText:@"请输入密码"]; + return;; + } + + NSString * publish_key = @" MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmZfR/bA9X3vp86y1aEpvwzXJYKRRF1fLau2+05/ZtaITLpV8bhkmSf3neSy/Q9gAdvG75Fr73E+GWE+K5b0BpvIS1jDGo319+PpZR39SaZTKZ27XFXrosmJTZutN79t819HS1VseleunHAFgMVufE9U5jP6LGzl/wbkSy01GhzwIDAQAB"; + + // 原始数据，要加密的字符串 + NSString *originalString = self.passwordField.text; + + // RSA 加密，使用字符串格式的公钥私钥加密解密, RSAPublickKey 为公钥字符串(NSString 格式) + NSString *encryptStr = [RSAObjC encrypt:originalString PublicKey:publish_key]; + + [self showMBProgressHUDWithString:@"登录中" autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:self.userNameField.text forKey:@"username"]; + //新增 + UIDevice *currentDevice = [UIDevice currentDevice]; + NSString * phone = [currentDevice getCurrentDeviceModel]; +// NSString * system = [NSString stringWithFormat:@"%.1f",CurrentSystemVersion] ; + if (!ValidStr(phone)) { + [parmDic setObject:phone forKey:@"deviceType"]; + + } + [parmDic setObject:@(CurrentSystemVersion) forKey:@"deviceSystem"]; + + [parmDic setObject:encryptStr forKey:@"password"]; + + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"LOGINGAPI" NeedToken:nil]; + [proctocolApi PostLogin:parmDic]; + +// +// NSString * userSig = @""; +// if ([self.userNameField.text isEqual:@"111"]) { +// +// userSig = @"eAEtzMsKgkAUBuB3OdtCzow2N3CTiZs01F4gcmpOkYgjUUTvnjhtv--ygeO*jXx3Pw0DdWBYgig1l1ytl2Sih51VSLHhUqgkqKcrGGhjXZZFvap2mTvnLneHbXOrG1k5XcT4Vk1Bo2Uq471PIQzta5gNjMBEIQZ72nE*4xH*O9TZfqILLcwYg*8PBAYuZw__"; +// }else { +// userSig = @"eAEtzLsOgjAUBuB36arB9gR6gMSBQV0g0UBwcTFpK0esaQARY3x3iXX9-subVXkZ9Ko9O0eKpSLkHBNAiJe-ZCCrZ5UoI0CUodeeLixl1xticRRCtmbf2M0z2dVVsS2jCbKHMK-Tyo1NVotykdvDmvmlnhx186PkYcy5t1F38xsE-N8hpe8DGfIMwD5fblkvWg__"; +// } +// +// [ESCTUIManager loginInitTUISDKUserID:self.userNameField.text userSig:userSig]; +// +// + +} + +#pragma mark -网络请求处理 +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self hiddenAllMBProgressHUD]; + [self showMBProgressHUDOnlyWithString:message]; + + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + + if ([tag isEqualToString:@"LOGINGAPI"]) { + [self hiddenAllMBProgressHUD]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"AVATAR"]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"placeholdImg"]; + + NSDictionary * dic = response; + HQUserInfo * user = [[HQUserInfo alloc] init]; + user.userInfo = [dic objectForKey:@"userInfo"]; + user.token = [dic objectForKey:@"token"]; + [HQCommonUtils keyedArchiverWithData:user key:LoginUserInfo]; + [[NSUserDefaults standardUserDefaults] setObject:@"1" forKey:@"LOGINAgree"]; + [[NSUserDefaults standardUserDefaults] synchronize]; + NSString * avatar = @""; + NSString * placeholdImg ; + if (!ValidStr(user.avatar)) { + avatar = user.avatar; + }else + { + if ([user.sex_dictText isEqualToString:@"女"]) { + placeholdImg = @"heard_man"; + }else + { + placeholdImg = @"heard_woman"; + } + } + if (ValidStr(user.personType) || [user.personType intValue] != 1 ) { + + [self showMBProgressHUDOnlyWithString:@"账号或登录密码错误，请重试"]; + return; + } + [[NSUserDefaults standardUserDefaults] setObject:avatar forKey:@"AVATAR"]; + [[NSUserDefaults standardUserDefaults] setObject:placeholdImg forKey:@"placeholdImg"]; + [[NSUserDefaults standardUserDefaults] synchronize]; + + KPostNotification(KNotificationLoginStateChange, @YES); + //登录im + [self loginImAccount]; + } + if ([tag isEqualToString:@"IMAPI"]) { + + NSDictionary * pamrDic = response; + + IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; + + IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; + iminfoModel.IMInfo = pamrDic; + [HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; + + + // 1. 从即时通信 IM 控制台获取应用 SDKAppID。 + // 2. 初始化 config 对象 + V2TIMSDKConfig *config = [[V2TIMSDKConfig alloc] init]; + + // 3. 指定 log 输出级别。 + config.logLevel = V2TIM_LOG_INFO; + // 4. 添加 V2TIMSDKListener 的事件监听器，self 是 id 的实现类，如果您不需要监听 IM SDK 的事件，这个步骤可以忽略。 + [[V2TIMManager sharedInstance] addIMSDKListener:self]; + // 5. 初始化 IM SDK，调用这个接口后，可以立即调用登录接口。 + [[V2TIMManager sharedInstance] initSDK:[model.sdkAppId intValue] config:config]; + + [ESCTUIManager loginInitTUISDKAppidWith:[model.sdkAppId intValue] UserID:model.userId userSig:model.userSig]; + } + if ([tag isEqualToString:@"AGREEAPI"]) { + + NSArray * array = response; + + for (NSDictionary * parmDic in array) { + + XJMineCenterUserModel * model = [XJMineCenterUserModel modelWithDictionary:parmDic]; + https://api.cqygjk.com/health-consultation/api/consult/conDoctor/selectDictList?dictKey=qh_jump_url + [self.dataArray addObject:model]; + + } + + } + if ([tag isEqualToString:@"VERSIONAPI"]) { + + NSString * version = response; + + + NSBundle *mainBundle = [NSBundle mainBundle]; + if (mainBundle) { + NSString *version = [mainBundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; +// NSString *build = [mainBundle objectForInfoDictionaryKey:@"CFBundleVersion"]; +// NSString *displayName = [mainBundle objectForInfoDictionaryKey:@"CFBundleDisplayName"]; +// NSString *fullVersion = [NSString stringWithFormat:@"%@ %@ (Build %@)", displayName, version, build]; + if([version floatValue] < [version floatValue]) { + self.regisBtn.hidden = true; + }else + { + self.regisBtn.hidden = false; + } + } + } +} + + +- (void)backHomeAction { + + KPostNotification(KNotificationLoginStateChange, @YES); + +} + + +- (void)loginImAccount { + + + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + [proctocolApi GetIMLoginAccount:nil]; + + + +} +//建议整体禁用（复制、粘贴、全选等都被禁用了） +-(BOOL)canPerformAction:(SEL)action withSender:(id)sender{ + + UIMenuController *menuController = [UIMenuController sharedMenuController]; + if (menuController) { + [UIMenuController sharedMenuController].menuVisible = NO; + } + return NO; +} + +- (void)agreeProtocolAction:(UIButton *)agreeBtn { + + agreeBtn.selected = !agreeBtn.selected; + + +} +#pragma mark:找回密码 +- (void)foundUserPasswordAction { +// GastoremteroscopeViewController * resultAppointVC = [[GastoremteroscopeViewController alloc] init]; +// [self.navigationController pushViewController:resultAppointVC animated:YES]; + XJLoginFoundPasswordViewController * foundVC = [[XJLoginFoundPasswordViewController alloc] init]; + + [self.navigationController pushViewController:foundVC animated:YES]; +} + +- (void)ishiderRegisData { + + + JKCQAPI * versionAPI = [[JKCQAPI alloc] init:self tag:@"VERSIONAPI" NeedToken:@""]; + + [versionAPI getVesionHideRegis:@{@"type":@"app_update_user_ios"}.mutableCopy]; + + +} + +#pragma mark:注册 +- (void)regisAction { + + XJRegisterViewController * forgetVc = [[XJRegisterViewController alloc] init]; + + [self presentViewController:forgetVc animated:YES completion:nil]; +} + + +-(BOOL)textFieldShouldBeginEditing:(UITextField *)textField { + + if(textField == self.passwordField) { + + self.passwordField.inputView = self.keyboard; + } + return YES; + +} + +- (void)keyboard:(LVKeyboard *)keyboard didClickDeleteButton:(UIButton *)deleteBtn string:(NSMutableString *)string { + self.passwordField.text = string; +} + +- (void)keyboard:(LVKeyboard *)keyboard didClickTextButton:(UIButton *)textBtn string:(NSMutableString *)string { + self.passwordField.text = string; +} + + +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { + [self.passwordField resignFirstResponder]; +} + +- (void)togglePasswordVisibility { + self.passwordField.secureTextEntry = !self.passwordField.secureTextEntry; + self.toggleButton.selected = !self.toggleButton.selected; +} +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h new file mode 100644 index 0000000..c661942 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.h @@ -0,0 +1,16 @@ +// +// XJRegisterViewController.h +// healthQuestion +// +// Created by xulei on 2022/8/17. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJRegisterViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m new file mode 100644 index 0000000..bf82a93 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/register/XJRegisterViewController.m @@ -0,0 +1,264 @@ +// +// XJRegisterViewController.m +// healthQuestion +// +// Created by xulei on 2022/8/17. +// + +#import "XJRegisterViewController.h" +#import "ADJumpViewController.h" +#import "XJMineCenterUserModel.h" + +@interface XJRegisterViewController () + +@property (nonatomic, strong)UITextField * phoneTextField; +@property (nonatomic, strong)UITextField * codeTextField; +@property (nonatomic, strong)UITextField * passwordTextField; +@property (nonatomic, strong)UITextField * surePasswordTextField; +@property (nonatomic, strong)UITextField * inviteCodeTextField; +@property (nonatomic, strong)UIButton * protocolBtn; +@property (nonatomic, strong)UIButton * codeButton; +@property (nonatomic, copy)NSString * protocolString; + +@end + +@implementation XJRegisterViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = YES; + self.StatusBarStyle = UIStatusBarStyleDefault; + self.view.backgroundColor = CViewBgColor; + [self createUI]; + [self getUserProtocol]; +} + +- (void)createUI +{ + + UIImageView * topBackImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(243))]; + topBackImg.image = IMAGE_NAMED(@"loginTopBimg"); + [self.view addSubview:topBackImg]; + + UIImageView * cenetrImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, kRealValue(70), kRealValue(68), kRealValue(68))]; + cenetrImg.centerX = self.view.centerX; + cenetrImg.image = IMAGE_NAMED(@"login_icon"); + [self.view addSubview:cenetrImg]; + + + UIImageView *titleImg = [[UIImageView alloc] initWithFrame:CGRectMake(0, cenetrImg.bottom + kRealValue(20), kRealValue(109), kRealValue(24))]; + titleImg.centerX = self.view.centerX; + titleImg.image = IMAGE_NAMED(@"loginTitle_Img"); + [self.view addSubview:titleImg]; + + UIButton * leftButton = [[UIButton alloc] initWithFrame:CGRectMake(11, 40, 20, 20)]; + [leftButton setImage:[UIImage imageNamed:@"close_Icon"] forState:UIWindowLevelNormal]; + [leftButton addTarget:self action:@selector(leftBtnClick) forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:leftButton]; + + UIView * connetView = [[UIView alloc] init]; + connetView.frame = CGRectMake(0, topBackImg.bottom+1, kScreenWidth, 200); + connetView.backgroundColor = [UIColor whiteColor]; + [self.view addSubview:connetView]; + + self.phoneTextField = [self createTextFieldWithFrame:CGRectMake(10, 0, kScreenWidth-20, 50) placeholder:@"请输入账户名" passWord:NO leftImageView:nil rightImageView:nil Font:14]; + self.phoneTextField.delegate =self; + self.phoneTextField.keyboardType = UIKeyboardTypeNumberPad; + [connetView addSubview:self.phoneTextField]; + + + self.passwordTextField = [self createTextFieldWithFrame:CGRectMake(10, self.phoneTextField.bottom+1, kScreenWidth-20, 50) placeholder:@"请输入密码(6-20位)" passWord:NO leftImageView:nil rightImageView:nil Font:14]; + self.passwordTextField.secureTextEntry = YES; + self.passwordTextField.delegate =self; + [connetView addSubview:self.passwordTextField]; + + + + //平台协议 + UIButton * protocolBtn = [[UIButton alloc] initWithFrame:CGRectMake(10, connetView.bottom+9, 20, 20)]; + [protocolBtn setImage:IMAGE_NAMED(@"login_nomalProtocol") forState:UIControlStateNormal]; + [protocolBtn setImage:IMAGE_NAMED(@"login_selectProtocol") forState:UIControlStateSelected]; + protocolBtn.selected = NO; + [protocolBtn addTarget:self action:@selector(agreeProtocol:) forControlEvents:UIControlEventTouchUpInside]; + self.protocolBtn = protocolBtn; + [self.view addSubview:protocolBtn]; + + UILabel * contentTitle = [[UILabel alloc] initWithFrame:CGRectMake(protocolBtn.right+5,connetView.bottom+9, 300, 20)]; + NSString *text = @"我已阅读并同意《健康咨询员工端使用协议》"; + NSMutableAttributedString *attributeStr = [[NSMutableAttributedString alloc]initWithString:text]; + [attributeStr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithRed:50/255.0 green:170/255.0 blue:223/255.0 alpha:1] range:NSMakeRange(7, text.length - 7)]; + contentTitle.attributedText = attributeStr; + contentTitle.textAlignment = NSTextAlignmentLeft; + contentTitle.font = [UIFont systemFontOfSize:12]; + contentTitle.userInteractionEnabled = YES; + UITapGestureRecognizer * tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tap)]; + [contentTitle addGestureRecognizer:tapRecognizer]; + [self.view addSubview:contentTitle]; + + UIButton * loginBtn = [[UIButton alloc] initWithFrame:CGRectMake(10, self.surePasswordTextField.bottom+140, kScreenWidth-20, 44)]; + loginBtn.mj_y = self.protocolBtn.bottom+25; + [loginBtn setTitle:@"注册" forState:UIControlStateNormal ]; + loginBtn.tag = 100; + loginBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:16]; + [loginBtn setBackgroundImage:[UIImage imageNamed:@"loginBtn_img"] forState:UIControlStateNormal]; + [loginBtn setTitleColor:UIColorTitle1 forState:UIControlStateNormal]; + [loginBtn addTarget:self action:@selector(regisOnClick) forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:loginBtn]; + +} +- (void)agreeProtocol:(UIButton *)agreeBtn +{ + agreeBtn.selected = !agreeBtn.selected; + +} + +#pragma mark - 获取协议 +- (void)getUserProtocol { + + JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + + [agreeAPI getUserAgreementPrivacy:nil]; +} + +// 跳转用户协议 +- (void)tap +{ + + ADJumpViewController * webVC= [[ADJumpViewController alloc] init]; + webVC.webTitle = @"用户注册协议"; + webVC.webUrl = [NSString stringWithFormat:@"%@%@",IntervenH5,self.protocolString]; + [self.navigationController pushViewController:webVC animated:YES]; +} + + +- (void)xmProtocol +{ + self.protocolBtn.selected = YES; + +} + +#pragma mark - 注册 + +- (void)regisOnClick +{ + if ([NSString stringWithFormat:@"%@",self.passwordTextField.text].length<6||[NSString stringWithFormat:@"%@",self.passwordTextField.text].length>20) + { + [EasyTextView showErrorText:@"密码的长度是6-20位"]; + return; + } + + if (!self.protocolBtn.selected ) + { + [EasyTextView showErrorText:@"请先阅读并同意协议"]; + return; + } + + [self showMBProgressHUDOnlyWithString:@"注册已提交，请等待审核通过后方可登录"]; +} + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + + + if ([tag isEqualToString:@"GetUserRegister"]) + { + [self showMBProgressHUDOnlyWithString:@"注册成功"]; + [self dismissViewControllerAnimated:YES completion:nil]; + } + if ([tag isEqualToString:@"AGREEAPI"]) { + + NSArray * array = response; + NSMutableArray * dataArray = [[NSMutableArray alloc] init]; + + for (NSDictionary * parmDic in array) { + + XJMineCenterUserModel * model = [XJMineCenterUserModel modelWithDictionary:parmDic]; + if ([model.value integerValue] == 1) { + self.protocolString = model.text; + } + [dataArray addObject:model]; + + } + + } +} + + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [EasyTextView showErrorText:message]; + + NSLog(@"apiError=%@",message); + // [self showMessage:message]; + +} + +- (void)leftBtnClick +{ + [self dismissViewControllerAnimated:YES completion:nil]; +} +//实现UITextField代理方法 +- (BOOL)textFieldShouldReturn:(UITextField *)textField { + + [textField resignFirstResponder];//取消第一响应者 + + return YES; +} + +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { + [self.view endEditing:YES]; +} +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +-(UITextField*)createTextFieldWithFrame:(CGRect)frame placeholder:(NSString*)placeholder passWord:(BOOL)YESorNO leftImageView:(UIView*)leftView rightImageView:(UIView*)rightView Font:(float)font +{ + UITextField*textField=[[UITextField alloc]initWithFrame:frame]; + //灰色提示框 + textField.placeholder=placeholder; + //文字对齐方式 + textField.textAlignment=NSTextAlignmentLeft; + textField.secureTextEntry=YESorNO; + + //边框 + //textField.borderStyle=UITextBorderStyleLine; + //键盘类型 + textField.returnKeyType=UIReturnKeyDone; + //关闭首字母大写 + textField.autocapitalizationType=NO; + //清除按钮 + textField.clearButtonMode=NO; + //左图片 + textField.leftView=leftView; + textField.leftViewMode=UITextFieldViewModeAlways; + //右图片 + textField.rightView=rightView; + //编辑状态下一直存在 + textField.rightViewMode=UITextFieldViewModeAlways; + //自定义键盘 + //textField.inputView + //字体 + textField.font=[UIFont systemFontOfSize:font]; + //字体颜色 + UIView * line2 = [[UIView alloc] initWithFrame:CGRectMake(0, frame.size.height-1, kScreenWidth, 1)]; + line2.backgroundColor = UIColorLine; + [textField addSubview:line2]; + return textField; + +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h new file mode 100644 index 0000000..09e27dd --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.h @@ -0,0 +1,21 @@ +// +// XJAddContactViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/27. +// + +#import "HQBaseViewController.h" +#import "XJEmergencyContactModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJAddContactViewController : HQBaseViewController + +@property (nonatomic, copy) NSString * contact_id; + +@property (nonatomic, strong) XJEmergencyContactModel * model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m new file mode 100644 index 0000000..568afaf --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m @@ -0,0 +1,355 @@ +// +// XJAddContactViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/27. +// + +#import "XJAddContactViewController.h" +#import "LineTextField.h" +#import "FamilyMemberRelationModel.h" +#import "BRStringPickerView.h" + +@interface XJAddContactViewController () + +@property (nonatomic, strong) LineTextField * nameField; + +@property (nonatomic, strong) LineTextField * phoneField; + +@property (nonatomic, strong) LineTextField * cardNumberField; + +@property (nonatomic, strong) LineTextField * relationshipTextField; + +@property (nonatomic, strong) NSMutableArray * memberArray; + +@property (nonatomic, copy) NSString * familyInt; + + +@end + +@implementation XJAddContactViewController + + +- (NSMutableArray *)memberArray { + if (!_memberArray) { + + _memberArray = [[NSMutableArray alloc] init]; + } + + return _memberArray; + +} + +- (void)viewDidLoad { + [super viewDidLoad]; + self.isHidenNaviBar = false; + self.navigationItem.title = @"紧急联系人"; + self.view.backgroundColor = KWhiteColor; + [self createUI]; + [self getFamilyMembers]; + // Do any additional setup after loading the view. +} + + +- (void)createUI { + + //咨询人姓名 + self.nameField = [self createFieldWithLeftTitle:@"姓名" withRightString:@"" placeholderStr:@"请填写紧急联系人姓名" isShowRight:true]; + self.nameField.frame = CGRectMake(0, 1, kScreenWidth, 51); + [self.view addSubview:self.nameField]; + //手机号 + self.phoneField = [self createFieldWithLeftTitle:@"手机号" withRightString:@" " placeholderStr:@"请填写手机号" isShowRight:true]; + self.phoneField.frame = CGRectMake(0, self.nameField.bottom, kScreenWidth, 51); + [self.view addSubview:self.phoneField]; + //身份证号码， + self.cardNumberField = [self createFieldWithLeftTitle:@"身份证号" withRightString:@"" placeholderStr:@"请填写身份证号" isShowRight:true]; + self.cardNumberField.frame = CGRectMake(0, self.phoneField.bottom, kScreenWidth, 51); + [self.view addSubview:self.cardNumberField]; + + + //与本人关系 + self.relationshipTextField = [self createFieldWithLeftTitle:@"与咨询人关系" withRightString:@">" placeholderStr:@"请点击选择" isShowRight:true]; + self.relationshipTextField.frame = CGRectMake(0, self.cardNumberField.bottom, kScreenWidth, 51); + self.relationshipTextField.userInteractionEnabled = true; + [self.view addSubview:self.relationshipTextField]; + + UIButton * shipBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 51)]; + [shipBtn addTarget:self action:@selector(relastionShipOnclick) forControlEvents:UIControlEventTouchUpInside]; + [self.relationshipTextField addSubview:shipBtn]; + + + //保存按钮 + + if (self.model) { + + self.nameField.text = self.model.name; + self.phoneField.text = self.model.phone; + self.cardNumberField.text = self.model.idCard; + self.relationshipTextField.text = self.model.familyRelation_dictText; + + UIButton * delectBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 - kRealValue(120) , kScreenHeight - kTopHeight - kTabBarHeight - 30 - 40, kRealValue(110), 33)]; + [delectBtn setTitle:@"删除" forState:UIControlStateNormal]; + delectBtn.titleLabel.font = SYSTEMFONT(14); + delectBtn.layer.cornerRadius = 17.0f; + delectBtn.layer.masksToBounds = true; + delectBtn.layer.borderColor = UIColorHex(#21BEBD).CGColor; + delectBtn.layer.borderWidth = 1.0f; + delectBtn.backgroundColor = KWhiteColor; + [delectBtn addTarget:self action:@selector(delectedInfoAction) forControlEvents:UIControlEventTouchUpInside]; + [delectBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; + [self.view addSubview:delectBtn]; + + UIButton * saveBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 + kRealValue(10), kScreenHeight - kTopHeight - kTabBarHeight - 30 - 40, kRealValue(110), 33)]; + [saveBtn setTitle:@"保存" forState:UIControlStateNormal]; + saveBtn.titleLabel.font = SYSTEMFONT(14); + saveBtn.layer.cornerRadius = 17; + saveBtn.layer.masksToBounds = true; + saveBtn.backgroundColor = UIColorHex(#21BEBD); + [saveBtn addTarget:self action:@selector(saveInfo) forControlEvents:UIControlEventTouchUpInside]; + [saveBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; + [self.view addSubview:saveBtn]; + }else + { + UIButton * saveBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(48), kScreenHeight - kTopHeight - kTabBarHeight - 30 - 40, kScreenWidth - kRealValue(96), 40)]; + [saveBtn setTitle:@"保存" forState:UIControlStateNormal]; + saveBtn.titleLabel.font = SYSTEMFONT(14); + saveBtn.layer.cornerRadius = 20.0f; + saveBtn.layer.masksToBounds = true; + saveBtn.layer.borderColor = UIColorHex(#21BEBD).CGColor; + saveBtn.layer.borderWidth = 1.0f; + saveBtn.backgroundColor = KWhiteColor; + [saveBtn addTarget:self action:@selector(saveInfo) forControlEvents:UIControlEventTouchUpInside]; + [saveBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; + [self.view addSubview:saveBtn]; + } + +} + + +- (LineTextField *)createFieldWithLeftTitle:(NSString *)leftStr + withRightString:(NSString *)rightStr + placeholderStr:(NSString *)placeStr + isShowRight:(BOOL)isShowRight { + + LineTextField * field = [[LineTextField alloc] init]; + field.font = SYSTEMFONT(13); + field.placeholder = placeStr; + field.textAlignment = NSTextAlignmentRight; + field.backgroundColor = KWhiteColor; + UIView * leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 51)]; + + UILabel * leftlabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(16), 0, 100, 51)]; + + leftlabel.text = leftStr; + + leftlabel.font = SYSTEMFONT(13); + + leftlabel.textAlignment = NSTextAlignmentLeft; + + leftlabel.textColor = UIColorHex(#666666); + + [leftView addSubview:leftlabel]; + + field.leftView = leftView; + + field.leftViewMode = UITextFieldViewModeAlways; + + if (isShowRight) { + + UIView * rightView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 51)]; + + UILabel * rightlabel = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 30, 51)]; + + rightlabel.text = rightStr; + + rightlabel.font = SYSTEMFONT(13); + + rightlabel.textColor = UIColorHex(#666666); + + field.rightView = rightView; + + rightlabel.textAlignment = NSTextAlignmentLeft; + + field.rightViewMode = UITextFieldViewModeAlways; + + [rightView addSubview:rightlabel]; + + } + + return field; +} + +- (void)delectedInfoAction { + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:self.model.contact_ID forKey:@"id"]; + + JKCQAPI * memberApi = [[JKCQAPI alloc] init:self tag:@"DelectedAPI" NeedToken:@""]; + [memberApi getDelectedEmergencyContact:parmDic]; + +} + + +- (void)getFamilyMembers { + + JKCQAPI * memberApi = [[JKCQAPI alloc] init:self tag:@"Family" NeedToken:@""]; + + [memberApi getCheckKeyResult:@{@"dictKey":@"family_member_relation"}]; + +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"Family"]) { + + NSArray * array = response; + + for (NSDictionary * dic in array) { + + FamilyMemberRelationModel * model = [FamilyMemberRelationModel modelWithDictionary:dic] ; + + [self.memberArray addObject:model]; + } + } + if ([tag isEqualToString:@"ADDAPI"]) { + + [EasyTextView showSuccessText:@"操作成功"]; + [self.navigationController popViewControllerAnimated:YES]; + + } + if ([tag isEqualToString:@"DelectedAPI"]) { + + [EasyTextView showSuccessText:@"操作成功"]; + [self.navigationController popViewControllerAnimated:YES]; + } + +} + + + +- (void)relastionShipOnclick { + + /// 1.单列字符串选择器（传字符串数组） + BRStringPickerView *stringPickerView = [[BRStringPickerView alloc]init]; + stringPickerView.pickerMode = BRStringPickerComponentSingle; + stringPickerView.title = @"关系"; + + NSMutableArray * array = [[NSMutableArray alloc] init]; + for (FamilyMemberRelationModel * model in self.memberArray) { + + [array addObject:model.text]; + } + stringPickerView.dataSourceArr = array; + stringPickerView.selectIndex = 2; + stringPickerView.resultModelBlock = ^(BRResultModel *resultModel) { + NSLog(@"选择的值：%@", resultModel.value); + + for (FamilyMemberRelationModel * model in self.memberArray) { + + if ([model.text isEqualToString:resultModel.value]) { + + self.familyInt = model.value; + } + + } + self.relationshipTextField.text = resultModel.value; + }; + + [stringPickerView show]; + +} + + +- (void)saveInfo { + + [self.view endEditing:TRUE]; + + + if (ValidStr(self.nameField.text)) { + [EasyTextView showErrorText:@"请输入紧急联系人姓名"]; + return; + } + if (ValidStr(self.phoneField.text)) { + [EasyTextView showErrorText:@"请输入手机号"]; + return; + } + if (ValidStr(self.cardNumberField.text)) { + [EasyTextView showErrorText:@"请输入身份证号"]; + return; + } + + if (ValidStr(self.relationshipTextField.text)) { + [EasyTextView showErrorText:@"请选择与咨询人关系"]; + return; + } + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + if (self.model) { + [parmDic setObject:self.model.contact_ID forKey:@"id"]; + }else + { + [parmDic setObject:@"" forKey:@"id"]; + } + [parmDic setObject:self.nameField.text forKey:@"name"]; + [parmDic setObject:self.phoneField.text forKey:@"phone"]; + [parmDic setObject:self.cardNumberField.text forKey:@"idCard"]; + [parmDic setObject:self.familyInt forKey:@"familyRelation"]; + + JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; + + [api postAddEmergencyContact:parmDic]; + +} + +- (NSString *)getTimestampFromTime:(NSString *)CurrentTime{ + + + + + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; + + [formatter setDateStyle:NSDateFormatterMediumStyle]; + + [formatter setTimeStyle:NSDateFormatterShortStyle]; + + [formatter setDateFormat:@"yyyy-MM-dd"]; //(@"YYYY-MM-dd hh:mm:ss") ----------设置你想要的格式,hh与HH的区别:分别表示12小时制,24小时制 + + //设置时区选择北京时间 + + NSTimeZone* timeZone = [NSTimeZone timeZoneWithName:@"Asia/Beijing"]; + + [formatter setTimeZone:timeZone]; + + NSDate* date = [formatter dateFromString:CurrentTime]; //------------将字符串按formatter转成nsdate + + //时间转时间戳的方法: + + NSInteger timeSp = [[NSNumber numberWithDouble:[date timeIntervalSince1970]] integerValue] * 1000; + + + return [NSString stringWithFormat:@"%ld",(long)timeSp]; + + + +} + + + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h new file mode 100644 index 0000000..cd18740 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.h @@ -0,0 +1,16 @@ +// +// XJEditSystemViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2024/1/10. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJEditSystemViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m new file mode 100644 index 0000000..4af9999 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEditSystemViewController.m @@ -0,0 +1,239 @@ +// +// XJEditSystemViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2024/1/10. +// + +#import "XJEditSystemViewController.h" +#import "XJLoginFoundPasswordViewController.h" +#import "XJMineCenterUserModel.h" +#import "ADJumpViewController.h" + +@interface XJEditSystemViewController () + +@property (nonatomic, strong) UITableView * homeTableView; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@end + +@implementation XJEditSystemViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + _dataArray = [[NSMutableArray alloc] init]; + } + return _dataArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.view.backgroundColor = CViewBgColor; + self.navigationItem.title = @"设置"; + [self createUI]; + [self createData]; +} + +- (void)createUI +{ + self.homeTableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight) style:UITableViewStyleGrouped]; + if (@available(iOS 11.0, *)) { + self.homeTableView.estimatedRowHeight = 0; + self.homeTableView.estimatedSectionFooterHeight = 0; + self.homeTableView.estimatedSectionHeaderHeight = 0; + self.homeTableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.homeTableView.delegate = self; + self.homeTableView.backgroundColor = CViewBgColor; + self.homeTableView.dataSource = self; + self.homeTableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; + self.homeTableView.showsVerticalScrollIndicator = NO; + [self.view addSubview:self.homeTableView]; +} + +- (void)createData { + + JKCQAPI * agreeAPI = [[JKCQAPI alloc] init:self tag:@"AGREEAPI" NeedToken:@""]; + + [agreeAPI getUserAgreementPrivacy:nil]; + +} + + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"AGREEAPI"]) { + + NSArray * array = response; + + for (NSDictionary * parmDic in array) { + + XJMineCenterUserModel * model = [XJMineCenterUserModel modelWithDictionary:parmDic]; + + [self.dataArray addObject:model]; + + } + + } +} + + +#pragma mark - DataSource +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + if (section == 0) { + return 3; + } + return 1; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 2; + +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + if (indexPath.section == 0) { + + NSArray * sectionOne = @[@"账号与安全（修改密码）",@"用户协议",@"隐私政策"]; + + + static NSString * cellID = @"cellID"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; + + if (!cell) { + + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.textLabel.font = SYSTEMFONT(14); + cell.textLabel.text = sectionOne[indexPath.row]; + cell.textLabel.textColor = UIColorHex(#666666); + cell.textLabel.font = SYSTEMFONT(14); + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.backgroundColor = KWhiteColor; + return cell; + + + } + if (indexPath.section == 1) { + + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CONNETCELL"]; + + if (!cell) { + + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"CONNETCELL"]; + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.textLabel.font = SYSTEMFONT(14); + cell.textLabel.text = @"版本号"; + cell.detailTextLabel.text = [[[NSBundle mainBundle]infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + return cell; + + + } + + + return UITableViewCell.new; + +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + + + return 44; + +} + +- (CGFloat )tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + + return CGFLOAT_MIN; +} + + +- (CGFloat )tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return kRealValue(5); +} + + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + + return UIView.new; + +} + + + + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + + if (indexPath.section == 0) { + + if (indexPath.row == 0) { + + XJLoginFoundPasswordViewController * loginVC = [[XJLoginFoundPasswordViewController alloc] init]; + [self.navigationController pushViewController:loginVC animated:YES]; + } + if (indexPath.row == 1) { + + for (XJMineCenterUserModel * model in self.dataArray) { + + if ([model.value integerValue] == 1) { + + ADJumpViewController * webVC= [[ADJumpViewController alloc] init]; + webVC.webTitle = @"用户协议"; + webVC.webUrl = [NSString stringWithFormat:@"%@%@",IntervenH5,model.text]; + [self.navigationController pushViewController:webVC animated:YES]; + } + + } + } + if (indexPath.row == 2) { + + for (XJMineCenterUserModel * model in self.dataArray) { + + if ([model.value integerValue] == 2) { + + ADJumpViewController * webVC= [[ADJumpViewController alloc] init]; + webVC.webTitle = @"隐私政策"; + webVC.webUrl = [NSString stringWithFormat:@"%@%@",IntervenH5,model.text]; + [self.navigationController pushViewController:webVC animated:YES]; + } + + } + } + } + + + +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h new file mode 100644 index 0000000..31f04e4 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.h @@ -0,0 +1,18 @@ +// +// XJMinePictureRecordViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/25. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJMinePictureRecordViewController : HQBaseViewController + +@property (nonatomic, assign) NSInteger selectOnes; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m new file mode 100644 index 0000000..4bd2fa6 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m @@ -0,0 +1,561 @@ +// +// XJMinePictureRecordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/25. +// +#import "XJMinePictureRecordViewController.h" + +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" +#import "RecordIMListDateModel.h" +#import "XJDoctorMainViewController.h" +@interface XJMinePictureRecordViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; +@property (nonatomic, strong) NSMutableArray * redCountArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, strong) NSMutableArray * groupIDArray; + +@property (nonatomic, strong) NSMutableArray * jingxingArray; + +@property (nonatomic, assign) NSInteger totalCount; + +@end + + +@implementation XJMinePictureRecordViewController + + +- (NSMutableArray *)groupIDArray { + + if (!_groupIDArray) { + + _groupIDArray = [[NSMutableArray alloc] init]; + + } + return _groupIDArray; + +} + +- (NSMutableArray *)redCountArray { + + if (!_redCountArray) { + + _redCountArray = [[NSMutableArray alloc] init]; + } + return _redCountArray; + +} +- (NSMutableArray *)jingxingArray { + + if (!_jingxingArray) { + + _jingxingArray = [[NSMutableArray alloc] init]; + + } + return _jingxingArray; + +} + + + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 0; + + + [self createUI]; + + if ([ESCTUIManager TUIUserStatus] == false) { + + [self loginImAccount]; + } + + if ([self.type integerValue] == 3) + { + [self getChatList]; + } + else + { + [self createData]; + } + +} + +- (void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated]; + + [self.homeTable.mj_header beginRefreshing]; + + +} +- (void)createUI { + + NSArray * array = @[@"进行中",@"已评价",@"历史"]; + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(80); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(15) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; + if (self.selectOnes == 3) { + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + if (self.selectOnes == 4) { + if (index == 1 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + if (self.selectOnes == 5) { + if (index == 2 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + if (self.selectOnes == 6) { + if (index == 2 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - 50 - SafetyAreaHeight) style:UITableViewStyleGrouped]; + + self.homeTable.detailBlock = ^(NSString * _Nonnull recordID, NSString * _Nonnull imID, NSString * _Nonnull memberId, RecordIMListDateModel * _Nonnull model) { + +// DoctorMainViewController * doctorVC = [[DoctorMainViewController alloc] init]; +// doctorVC.yuyue_id = recordID; +// [self.navigationController pushViewController:doctorVC animated:YES]; + if ([TUILogin isUserLogined]) { + ChatViewController * chatVC = [[ChatViewController alloc] init]; + chatVC.isGroupID = YES; + chatVC.chatID = imID ; + chatVC.pictureEnd_id = recordID ; + chatVC.eableSendReport = true; + chatVC.eablehaveHelathData = false; + chatVC.navTitle = @"图文咨询"; + chatVC.isVideo = NO; + chatVC.questionType = 2; + chatVC.medicalRecordsId = memberId; + //是否评价 + if ([model.contentStatus integerValue] == 5 ) { + chatVC.isEveal = true; + }else + { + chatVC.isEveal = false; + } + + if ([model.contentStatus intValue] >= 4) + { + chatVC.endRecordType = 100; + } + [self.navigationController pushViewController:chatVC animated:YES]; + }else + { + [self loginImAccount]; + } + + }; + [self.view addSubview:self.homeTable]; + +// [self.homeTable mas_makeConstraints:^(MASConstraintMaker *make) { +// make.top.mas_equalTo(@50); +// make.bottom.left.right.mas_offset(0); +// }]; + + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 0; + if ([ESCTUIManager TUIUserStatus] == false) { + + [self loginImAccount]; + } + if ([self.type integerValue] == 3) + { + [self getChatList]; + } + else + { + [weakSelf createData]; + } + + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + if ([ESCTUIManager TUIUserStatus] == false) { + + [self loginImAccount]; + } + if ([self.type integerValue] == 3) + { + [self getChatList]; + } + else + { + [weakSelf createData]; + } + }]; + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + //元素竖直方向的间距 + emptyView.subViewMargin = 20.f; + //标题颜色 + emptyView.titleLabTextColor = [UIColor blackColor]; + //描述字体 + emptyView.detailLabFont = [UIFont systemFontOfSize:17]; + //按钮背景色 + emptyView.actionBtnBackGroundColor = KWhiteColor; + emptyView.actionBtnWidth = CGFLOAT_MIN; + emptyView.actionBtnHeight = CGFLOAT_MIN; + + //设置空内容占位图 + self.homeTable.ly_emptyView = emptyView; + + +} +//获取腾讯im会话列表 + +- (void)getChatList { + + + V2TIMConversationListFilter *filter = [[V2TIMConversationListFilter alloc] init]; +// filter.type = V2TIM_C2C; //拉取单聊会话 + filter.type = V2TIM_GROUP; //拉取群聊会话 + [[V2TIMManager sharedInstance] getConversationListByFilter:filter nextSeq:self.pageNo count:50 succ:^(NSArray *list, uint64_t nextSeq, BOOL isFinished) { + // 获取会话列表成功，list 为会话列表 + if (self.pageNo == 0) { + [self.groupIDArray removeAllObjects]; + } + DLog(@"%@",list); + [self.redCountArray addObjectsFromArray:list]; + + for (V2TIMConversation * v2Model in list) { + [self.groupIDArray addObject: v2Model.groupID]; + + + } + [self postGroupArray:self.groupIDArray]; + } fail:^(int code, NSString *desc) { + // 获取会话列表失败 + }]; + +// //获取所以会话的未读总数 +// // filter.type = V2TIM_GROUP; //拉取群聊会话 +// +// [[V2TIMManager sharedInstance] getUnreadMessageCountByFilter:filter succ:^(UInt64 totalUnreadCount) { +// self.totalCount = totalUnreadCount; +// } fail:^(int code, NSString *desc) { +// +// }]; + +} + + +#pragma mark:上传id数组 +- (void)postGroupArray:(NSArray *)array { + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:array forKey:@"imIds"]; + [self showMBProgressHUDWithString:@"数据加载中，请稍候..." autoHidden:NO]; + JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; + [recordApi PostGroupIDArray:parmDic]; +} + + +- (void)createData { + // type : 1 图文 2 音视频 + [self showMBProgressHUDWithString:@"数据加载中，请稍候..." autoHidden:NO]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [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:@""]; + [recordApi getMineQuestionRecord:parmDic]; +} + +- (void)loginImAccount { + + + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + [proctocolApi GetIMLoginAccount:nil]; + + + +} + + + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + if ([tag isEqualToString:@"RECORD"]) { + [self hiddenAllMBProgressHUD]; + if (self.pageNo == 0) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + + for (NSDictionary * dic in array) { + + RecordIMListDateModel * model = [ RecordIMListDateModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } + if ([tag isEqualToString:@"IMAPI"]) { + + + NSDictionary * pamrDic = response; + + IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; + + IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; + iminfoModel.IMInfo = pamrDic; + [HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; + + // 1. 从即时通信 IM 控制台获取应用 SDKAppID。 + // 2. 初始化 config 对象 + V2TIMSDKConfig *config = [[V2TIMSDKConfig alloc] init]; + // 3. 指定 log 输出级别。 + config.logLevel = V2TIM_LOG_INFO; + // 4. 添加 V2TIMSDKListener 的事件监听器，self 是 id 的实现类，如果您不需要监听 IM SDK 的事件，这个步骤可以忽略。 + [[V2TIMManager sharedInstance] addIMSDKListener:self]; + // 5. 初始化 IM SDK，调用这个接口后，可以立即调用登录接口。 + [[V2TIMManager sharedInstance] initSDK:[model.sdkAppId intValue] config:config]; + + // 1. 从即时通信 IM 控制台获取应用 SDKAppID。 + // 2. 初始化 config 对象 + + // 3. 指定 log 输出级别。 + config.logLevel = V2TIM_LOG_INFO; + // 4. 添加 V2TIMSDKListener 的事件监听器，self 是 id 的实现类，如果您不需要监听 IM SDK 的事件，这个步骤可以忽略。 + // 5. 初始化 IM SDK，调用这个接口后，可以立即调用登录接口。 + + [TUILogin login:[model.sdkAppId intValue] userID:model.userId userSig:model.userSig succ:^{ + + [self getChatList]; + + } fail:^(int code, NSString *msg) { + + [EasyTextView showErrorText:msg]; + + }]; + + + + + } + if ([tag isEqualToString:@"GROUPID"]) { + + NSArray * array = response; + [self.jingxingArray removeAllObjects]; + [self hiddenAllMBProgressHUD]; + for (NSDictionary * parmDic in array) { + + RecordIMListDateModel * model = [ RecordIMListDateModel modelWithDictionary:parmDic]; + + for (V2TIMConversation * v2Model in self.redCountArray) { + + if ([v2Model.groupID isEqualToString:model.imId]) + { + model.unredCount = v2Model.unreadCount; + } + } + + [self.jingxingArray addObject:model]; + } + self.homeTable.dataArray = self.jingxingArray; +// self.homeTable.totalCount + } +} + +- (void)statusChange:(UIButton *)statusBtn { + [self.dataArray removeAllObjects]; + if (statusBtn.tag == 1000) { + self.type = @"3"; //进行中 + [self getChatList]; + } + if (statusBtn.tag == 1001) { + self.type = @"5"; //已评价 + [self createData]; + } + if (statusBtn.tag == 1002) { + self.type = @""; //全部 历史 + [self createData]; + } + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + + +} + +- (void)setSelectOnes:(NSInteger)selectOnes { + + _selectOnes = selectOnes; + self.type = [NSString stringWithFormat:@"%ld",_selectOnes]; + switch (_selectOnes) { + case 3://进行中 + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1000) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + case 5://已评价 + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1001) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + case 6: + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1002) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + + + default: + break; + } + +} + +//在线时票据过期：此时您需要生成新的 userSig，并再次重新调用初始化。 +- (void)onKickedOffline { + + [HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; + [ESCTUIManager outLoginTUISDK]; + KPostNotification(KNotificationLoginStateChange, @NO); + +} +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h new file mode 100644 index 0000000..cd1fc4d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.h @@ -0,0 +1,18 @@ +// +// XJMineQuestionRecordViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/25. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJMineQuestionRecordViewController : HQBaseViewController + +@property (nonatomic, assign) NSInteger type; // 1 进行中 2 待评价 3 已评价 4 历史 +@property (nonatomic, assign) NSInteger titleSelected; // 10 图文 11 音视频 +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m new file mode 100644 index 0000000..c455b95 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m @@ -0,0 +1,256 @@ +// +// XJMineQuestionRecordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/25. +// + +#import "XJMineQuestionRecordViewController.h" +#import "XJMineVideoRecordViewController.h" +#import "XJMinePictureRecordViewController.h" + +@interface XJMineQuestionRecordViewController () + +/** 顶部控件*/ +@property (nonatomic, weak) UIScrollView *topView; +/** 下划线 */ +@property (nonatomic, weak) UIView *lineView; +/** 滚动视图 */ +@property (nonatomic, weak) UICollectionView *collectionView; +/** 当前选中的按钮 */ +@property (nonatomic, weak) UIButton *selectButton; +/** 按钮数组 */ +@property (nonatomic, strong) NSMutableArray *titleButtons; + +@end + +@implementation XJMineQuestionRecordViewController + +#pragma mark - 懒加载 +- (NSMutableArray *)titleButtons { + if (_titleButtons==nil) { + _titleButtons = [NSMutableArray array]; + } + return _titleButtons; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = NO; + self.title = @"我的咨询"; + self.view.backgroundColor = UIColorBackground; +// [self addNavigationItemWithImageNames:@[@"backIcon@2x"] isLeft:YES target:self action:@selector(popVc) tags:@[@"100"]]; + [self createUI]; + +} + +#pragma mark:返回 +- (void)popVc +{ + [self.navigationController popViewControllerAnimated:YES]; +} + +- (void)createUI +{ + [self setupNavgationBar]; + + // 添加底部内容view + [self setupBottomContentView]; + + // 添加所有子控制器 + [self setupAllChildViewController]; + + [self setupAllTitle:self.titleSelected]; + + // 不添加额外滚动区域 + self.automaticallyAdjustsScrollViewInsets = NO; +} + +#pragma mark - 添加所有的子控制器 +- (void)setupAllChildViewController { + + XJMinePictureRecordViewController * pictureVc = [[XJMinePictureRecordViewController alloc] init]; + pictureVc.navigationItem.title = @"图文咨询"; + pictureVc.selectOnes = self.type; + pictureVc.view.backgroundColor = CViewBgColor; + [self addChildViewController:pictureVc]; + + // + XJMineVideoRecordViewController * videoVc = [[XJMineVideoRecordViewController alloc] init]; + videoVc.navigationItem.title = @"视频咨询"; + videoVc.selectOnes = self.type; + videoVc.view.backgroundColor = CViewBgColor; + [self addChildViewController:videoVc]; + +} + +#pragma mark - 设置导航条内容 +- (void)setupNavgationBar { + UIScrollView *topView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 1, kScreenWidth, kRealValue(48))]; + topView.backgroundColor = [UIColor whiteColor]; + _topView = topView; + [self.view addSubview:topView]; +} + +#pragma mark - 按钮被点击 +- (void)titleClick:(UIButton *)titleButton{ + + NSInteger i = titleButton.tag; + // 重复点击标题按钮的时候,刷新当前界面 + if (titleButton == _selectButton) { + } + + [self selButton:titleButton]; + + //滚动collectionView 修改偏移量 + CGFloat offsetX = i * kScreenWidth; + _collectionView.contentOffset = CGPointMake(offsetX, 0); +} + +#pragma mark - 选中标题按钮 +- (void)selButton:(UIButton *)titleButton{ + + _selectButton.selected = NO; + titleButton.selected = YES; + _selectButton = titleButton; + + // 移动下划线的位置 + [UIView animateWithDuration:0.25 animations:^{ + _lineView.centerX = titleButton.centerX; + }]; +} + +#pragma mark - 添加标题 +- (void)setupAllTitle:(NSInteger)titleSelected{ + + NSUInteger count = self.childViewControllers.count; + CGFloat btnX = 0; + CGFloat btnW = kScreenWidth/count; + CGFloat btnH = _topView.height; + for (int i = 0; i < count; i++) { + UIButton *titleButton = [UIButton buttonWithType:UIButtonTypeCustom]; + titleButton.tag = i; + + UIViewController *vc = self.childViewControllers[i]; + [titleButton setTitle:vc.navigationItem.title forState:UIControlStateNormal]; + // 设置标题颜色 + [titleButton setTitleColor:RGBA(34, 34, 34, 1) forState:UIControlStateSelected]; + [titleButton setTitleColor:RGBA(102, 102, 102, 1) forState:UIControlStateNormal]; + + // 设置标题字体 + titleButton.titleLabel.font = MEDIUMFONT(14); + + btnX = i * btnW; + + titleButton.frame = CGRectMake(btnX, 0, btnW, btnH); + + // 监听按钮点击 + [titleButton addTarget:self action:@selector(titleClick:) forControlEvents:UIControlEventTouchUpInside]; + + [_topView addSubview:titleButton]; + + if (i == titleSelected - 10) { + // 添加下划线 + // 下划线宽度 = 按钮文字宽度 + // 下划线中心点x = 按钮中心点x + CGFloat h = 5; + CGFloat y = kRealValue(45) ; + UIView *lineView =[[UIView alloc] init]; + // 位置和尺寸 + lineView.height = h; + // 先计算文字尺寸,在给label去赋值 + [titleButton.titleLabel sizeToFit]; + lineView.width = kRealValue(28); + lineView.centerX = titleButton.centerX; + lineView.mj_y = y; + lineView.backgroundColor = UIColorHex(#21BEBD); + _lineView = lineView; + [_topView addSubview:lineView]; + + [self titleClick:titleButton]; + } + [self.titleButtons addObject:titleButton]; + } +} + +#pragma mark - 添加底部内容view +- (void)setupBottomContentView +{ + // 创建一个流水布局 + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.itemSize = CGSizeMake(kScreenWidth, kScreenHeight-44); + + // 设置水平滚动方向 + layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; + layout.minimumInteritemSpacing = 0; + layout.minimumLineSpacing = 0; + + // 创建UICollectionView + UICollectionView *collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0,kRealValue(48), kScreenWidth, kScreenHeight - kRealValue(48) ) collectionViewLayout:layout]; + collectionView.backgroundColor = [UIColor whiteColor]; + [self.view addSubview:collectionView]; + _collectionView = collectionView; + collectionView.scrollsToTop = NO; + collectionView.scrollEnabled = YES; + // 开启分页 + collectionView.pagingEnabled = YES; + collectionView.showsHorizontalScrollIndicator = NO; + collectionView.bounces = YES; + + // 展示cell + collectionView.dataSource = self; + collectionView.delegate = self; + + // 注册cell + [collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:@"COUPCELLID"]; +} + +#pragma mark - UICollectionViewDelegate +// 滚动完成的时候就会调用 +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{ + // 获取角标 + NSInteger i = scrollView.contentOffset.x / kScreenWidth; + + // 获取选中标题 + UIButton *selButton = self.titleButtons[i]; + + // 选中标题 + [self selButton:selButton]; +} + +#pragma mark - UICollectionViewDataSource +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ + + return self.childViewControllers.count; +} + +// 只要有新的cell出现的时候才会调用 +- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ + + UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"COUPCELLID" forIndexPath:indexPath]; + + // 移除之前子控制器view + [cell.contentView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; + + // 取出对应的子控制器添加到对应cell上 + UIViewController *vc = self.childViewControllers[indexPath.row]; + + [cell.contentView addSubview:vc.view]; + + return cell; +} + + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h new file mode 100644 index 0000000..e83ba85 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.h @@ -0,0 +1,16 @@ +// +// XJMineUserInfoViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJMineUserInfoViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m new file mode 100644 index 0000000..4e57bdf --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineUserInfoViewController.m @@ -0,0 +1,141 @@ +// +// XJMineUserInfoViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import "XJMineUserInfoViewController.h" +#import "XJMineUserInfoTable.h" +#import "XJEmergencyContactModel.h" +#import "XJAddContactViewController.h" +@interface XJMineUserInfoViewController () + +@property (nonatomic, strong) XJMineUserInfoTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * dataArray; + + +@end + +@implementation XJMineUserInfoViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + } + + return _dataArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.navigationItem.title = @"个人信息"; + self.isHidenNaviBar = false; + self.view.backgroundColor = KWhiteColor; + [self createUI]; + [self createData]; + +} + +- (void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated] ; + [self.dataArray removeAllObjects]; + [self getEmergencyContact]; + + + +} +- (void)createUI { + + MJWeakSelf + self.homeTable = [[XJMineUserInfoTable alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight) style:UITableViewStyleGrouped]; + self.homeTable.addBlcok = ^{ + //新增紧急联系人 + [weakSelf addEmergencyContact]; + }; + self.homeTable.editBlcok = ^(XJEmergencyContactModel * _Nonnull model) { + + XJAddContactViewController * addVC = [[XJAddContactViewController alloc] init]; + addVC.model = model; + [weakSelf.navigationController pushViewController:addVC animated:YES]; + }; + [self.view addSubview:self.homeTable]; + +} + +- (void)createData { + + JKCQAPI * infoApi = [[JKCQAPI alloc] init:self tag:@"USERINFO" NeedToken:@""]; + [infoApi getMineCenterUserInfo:nil]; + + +} + + + +- (void)getEmergencyContact { + + NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; + + JKCQAPI * numbeApi = [[JKCQAPI alloc] init:self tag:@"ContactAPI" NeedToken:@""]; + + [numbeApi getEmergencyContact:dic]; +} + + +#pragma mark -网络请求处理 +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self hiddenAllMBProgressHUD]; + + if ([tag isEqualToString:@"USERINFO"]) { + NSDictionary * dic = response; + XJMineCenterUserModel * userModel = [XJMineCenterUserModel modelWithDictionary:dic]; + self.homeTable.model = userModel; + + } + if ([tag isEqualToString:@"ContactAPI"]) { + + NSArray * array = response; + + for (NSDictionary * parmDic in array) { + + XJEmergencyContactModel * model = [XJEmergencyContactModel modelWithDictionary:parmDic]; + + [self.dataArray addObject:model]; + + } + self.homeTable.dataArray = self.dataArray; + } +} +#pragma mark:新增联系人 +- (void)addEmergencyContact { + + XJAddContactViewController * addVC = [[XJAddContactViewController alloc] init]; + + [self.navigationController pushViewController:addVC animated:YES]; + +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h new file mode 100644 index 0000000..cc40e2d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h @@ -0,0 +1,19 @@ +// +// XJMineVideoRecordViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/25. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJMineVideoRecordViewController : HQBaseViewController + +@property (nonatomic, assign) NSInteger selectOnes; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m new file mode 100644 index 0000000..06c6d62 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m @@ -0,0 +1,374 @@ +// +// XJMineVideoRecordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/25. +// + +#import "XJMineVideoRecordViewController.h" +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" +#import "RecordIMListDateModel.h" +#import "XJDoctorMainViewController.h" +@interface XJMineVideoRecordViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, strong) NSMutableArray * groupIDArray; + +@property (nonatomic, strong) NSMutableArray * jingxingArray; + +@end + + +@implementation XJMineVideoRecordViewController + + +- (NSMutableArray *)groupIDArray { + + if (!_groupIDArray) { + + _groupIDArray = [[NSMutableArray alloc] init]; + + } + return _groupIDArray; + +} + +- (NSMutableArray *)jingxingArray { + + if (!_jingxingArray) { + + _jingxingArray = [[NSMutableArray alloc] init]; + + } + return _jingxingArray; + +} + + + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 0; + self.type = [NSString stringWithFormat:@"%ld",_selectOnes]; + [self createUI]; + [self createData]; +} + +- (void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated]; + + [self.homeTable.mj_header beginRefreshing]; + +} + +- (void)createUI { + + NSArray * array = @[@"进行中",@"待评价",@"已评价",@"历史"]; + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(70); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(17) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; +// if (index == 0 ) { +// listBtn.selected = YES; +// listBtn.backgroundColor = UIColorHex(#21BEBD); +// }else{ +// listBtn.backgroundColor = UIColorHex(#DDDDDD); +// } + if (self.selectOnes == 3) { + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + if (self.selectOnes == 4) { + if (index == 1 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + if (self.selectOnes == 5) { + if (index == 2 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + if (self.selectOnes == 6) { + if (index == 3 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - 45 - 60) style:UITableViewStyleGrouped]; + MJWeakSelf; + self.homeTable.detailBlock = ^(NSString * _Nonnull recordID, NSString * _Nonnull imID, NSString * _Nonnull memberId, RecordIMListDateModel * _Nonnull model) { + + XJDoctorMainViewController * doctorVC = [[XJDoctorMainViewController alloc] init]; + doctorVC.yuyue_id = recordID; + doctorVC.popType = 1; + [weakSelf.navigationController pushViewController:doctorVC animated:YES]; + }; + [self.view addSubview:self.homeTable]; + + + + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 0; + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + //元素竖直方向的间距 + emptyView.subViewMargin = 20.f; + //标题颜色 + emptyView.titleLabTextColor = [UIColor blackColor]; + //描述字体 + emptyView.detailLabFont = [UIFont systemFontOfSize:17]; + //按钮背景色 + emptyView.actionBtnBackGroundColor = KWhiteColor; + emptyView.actionBtnWidth = CGFLOAT_MIN; + emptyView.actionBtnHeight = CGFLOAT_MIN; + + //设置空内容占位图 + self.homeTable.ly_emptyView = emptyView; +} + + +- (void)createData { + // type : 1 图文 2 音视频 + [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:NO]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [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:@""]; + [recordApi getMineQuestionRecord:parmDic]; +} + + + + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + + if ([tag isEqualToString:@"RECORD"]) { + + [self hiddenAllMBProgressHUD]; + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + if (self.pageNo == 0) { + [self.dataArray removeAllObjects]; + } + for (NSDictionary * dic in array) { + + RecordIMListDateModel * model = [ RecordIMListDateModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + + self.homeTable.dataArray = self.dataArray; + + } + + +} + +- (void)statusChange:(UIButton *)statusBtn { + + + if (statusBtn.tag == 1000) { //进行中 + self.type = @"3"; + } + if (statusBtn.tag == 1001) { //待评价 + self.type = @"4"; + } + if (statusBtn.tag == 1002) { //已评价 + self.type = @"5"; + } + if (statusBtn.tag == 1003) { //全部 + self.type = @"6"; + } + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + + [self.homeTable.mj_header beginRefreshing]; +} + +- (void)setSelectOnes:(NSInteger)selectOnes { + + _selectOnes = selectOnes; + + switch (_selectOnes) { + case 3: //进行中 + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1000) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + case 4: //待评价 + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1001) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + case 5://已经评价 + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1002) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + case 6:// 全部历史 + { + for (UIButton * seleBtn in self.buttonArray) { + if (seleBtn.tag == 1002) { + seleBtn.selected = YES; + seleBtn.backgroundColor = UIColorHex(#21BEBD); + }else + { + seleBtn.selected = NO; + seleBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + } + break; + + default: + break; + } + +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h new file mode 100644 index 0000000..0a406f9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.h @@ -0,0 +1,16 @@ +// +// MyCenterViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/2/13. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJMyCenterViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m new file mode 100644 index 0000000..2d874e9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m @@ -0,0 +1,294 @@ +// +// MyCenterViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/2/13. +// + +#import "XJMyCenterViewController.h" +#import "XJSliderView.h" +#import "UILabel+Extension.h" +#import "XJMyCenterTableView.h" +#import "QuestionPeopleMangerVC.h" +#import "XJSosCenterViewController.h" +#import "XJMineQuestionRecordViewController.h" +#import "XJMineUserInfoViewController.h" +#import "XJMineCenterUserModel.h" +#import "XJEditSystemViewController.h" +#import "XJSOSLookDoctoreViewController.h" + +@interface XJMyCenterViewController () + +@property (nonatomic, strong) XJMyCenterTableView * homeTable; + + +@end + +@implementation XJMyCenterViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + self.isHidenNaviBar = false; + self.navigationItem.title = @"个人中心"; + self.view.backgroundColor = UIColorHex(#EEEEEE); +// [self createTopAndNav]; + [self addNavigationItemWithImageNames:@[@"setting_icon"] isLeft:false target:self action:@selector(settingAction) tags:@[ @"100"]]; + [self createUI]; + + + +} + +-(void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated]; + + if ([HQCommonUtils isLogin]) { + [self createUserInfo]; + [self questionNumber]; + } + + if (@available(iOS 15.0, *)) { + UINavigationBarAppearance *appearance = [UINavigationBarAppearance new]; + [appearance configureWithOpaqueBackground]; // 使用纯色背景（更推荐） + appearance.backgroundColor = UIColorHex(#21BEBD); + appearance.shadowColor = nil; // ✅ 隐藏底部阴影线 + appearance.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; + + self.navigationController.navigationBar.standardAppearance = appearance; + self.navigationController.navigationBar.scrollEdgeAppearance = appearance; + self.navigationController.navigationBar.compactAppearance = appearance; + + self.navigationController.navigationBar.tintColor = [UIColor whiteColor]; // 按钮颜色 + } else { + self.navigationController.navigationBar.barTintColor = UIColorHex(#21BEBD); + [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}]; + [self.navigationController.navigationBar setShadowImage:[UIImage new]]; // ✅ 旧系统隐藏阴影线 + [self.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault]; + } + +} + + +- (void)settingAction { + + XJEditSystemViewController * infoVC = [[XJEditSystemViewController alloc] init]; + [self.navigationController pushViewController:infoVC animated:YES]; + +} + +#pragma mark - numberFormat +- (NSString *)numberFormat:(float)num { + NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; + [formatter setPositiveFormat:@"0"]; + return [formatter stringFromNumber:[NSNumber numberWithFloat:num]]; +} + + + +- (void)createUI { + + UIView * topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(120))]; + topView.backgroundColor = UIColorHex(#21BEBD); + [self.view addSubview:topView]; + + + + self.homeTable = [[XJMyCenterTableView alloc] initWithFrame:CGRectMake(kRealValue(15), kRealValue(25), kScreenWidth - kRealValue(30), kScreenHeight - kRealValue(25) - kTopHeight - kTabBarHeight) style:UITableViewStyleGrouped]; + self.homeTable.heardDelegate =self; + self.homeTable.cellDelegate = self; + self.homeTable.contentInset = UIEdgeInsetsMake(20, 0, 0, 0); + [self.homeTable scrollRectToVisible:CGRectMake(0, 29,1, 1) animated:YES]; + [self.view addSubview:self.homeTable]; + + UIButton * outLoginBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(48), kScreenHeight - kTabBarHeight - kTopHeight -kRealValue(100) , kScreenWidth - kRealValue(96), kRealValue(40))]; + outLoginBtn.backgroundColor = KWhiteColor; + if ([HQCommonUtils isLogin]) { + [outLoginBtn setTitle:@"退出登录" forState:UIControlStateNormal]; + [outLoginBtn addTarget:self action:@selector(outLoginUserinfo) forControlEvents:UIControlEventTouchUpInside]; + }else + { + [outLoginBtn setTitle:@"去登录" forState:UIControlStateNormal]; + [outLoginBtn addTarget:self action:@selector(gotoLoginUserinfo) forControlEvents:UIControlEventTouchUpInside]; + } + [outLoginBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; + outLoginBtn.layer.cornerRadius = 20; + outLoginBtn.layer.masksToBounds = YES; + outLoginBtn.layer.borderColor = UIColorHex(#21BEBD).CGColor; + outLoginBtn.titleLabel.font = SYSTEMFONT(14); + outLoginBtn.layer.borderWidth = 1.0f; + [self.view addSubview:outLoginBtn]; +} + +- (void)createUserInfo { + + [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:NO]; + JKCQAPI * infoApi = [[JKCQAPI alloc] init:self tag:@"USERINFO" NeedToken:@""]; + [infoApi getMineCenterUserInfo:nil]; +} + +- (void)outLoginUserinfo { + + + UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:@"是否确定退出登录？" preferredStyle:UIAlertControllerStyleAlert]; + + UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) { + + }]; + UIAlertAction *sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { + [HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; + [ESCTUIManager outLoginTUISDK]; + KPostNotification(KNotificationLoginStateChange, @NO); + }]; + [alertController addAction:cancelAction]; + [alertController addAction:sureAction]; + + [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:alertController animated:YES completion:nil]; +} + +#pragma mark:进行中 +- (void)myCenterInProgress { + + XJMineQuestionRecordViewController * recordVC = [[XJMineQuestionRecordViewController alloc] init]; + recordVC.titleSelected = 10;//图文视频 + recordVC.type = 3; + [self.navigationController pushViewController:recordVC animated:YES]; +} + +#pragma mark:待评价 +- (void)waitEvaluation { + + XJMineQuestionRecordViewController * recordVC = [[XJMineQuestionRecordViewController alloc] init]; + recordVC.titleSelected = 11;//音视频 + recordVC.type = 4; + [self.navigationController pushViewController:recordVC animated:YES]; +} + +#pragma mark:已评价 +- (void)completeEvaluation { + XJMineQuestionRecordViewController * recordVC = [[XJMineQuestionRecordViewController alloc] init]; + recordVC.titleSelected = 10;//图文视频 + recordVC.type = 4; + [self.navigationController pushViewController:recordVC animated:YES]; + +} +#pragma mark:历史 +- (void)myHistoryAction { + XJMineQuestionRecordViewController * recordVC = [[XJMineQuestionRecordViewController alloc] init]; + recordVC.titleSelected = 10;//图文视频 + recordVC.type = 6; + [self.navigationController pushViewController:recordVC animated:YES]; + +} +#pragma mark:查看全部 +- (void)lookAllQuestion { + + XJMineQuestionRecordViewController * recordVC = [[XJMineQuestionRecordViewController alloc] init]; + recordVC.titleSelected = 10;//图文视频 + recordVC.type = 6; + [self.navigationController pushViewController:recordVC animated:YES]; +} + +- (void)cellListClick:(NSInteger)cellIndex { + + HQUserInfo *infoModel = [HQCommonUtils keyedUnarchiverWithKey:LoginUserInfo]; + + UIViewController *vcToPush = nil; + switch (cellIndex) { + case 0: + vcToPush = [[QuestionPeopleMangerVC alloc] init]; + break; + case 1: + vcToPush = [[XJSOSLookDoctoreViewController alloc] init]; + break; + default: + break; + } + if (vcToPush) { + [self.navigationController pushViewController:vcToPush animated:YES]; + } + + + + + +} + +- (void)questionNumber { + + NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; + + JKCQAPI * numbeApi = [[JKCQAPI alloc] init:self tag:@"NUMBERAPI" NeedToken:@""]; + + [numbeApi getMineCenterNumber:dic]; + +} + +- (void)heardImageOnClick { + + if (![HQCommonUtils isLogin]) { + + KPostNotification(KNotificationLoginStateChange, @NO); + return; + } + + XJMineUserInfoViewController * infoVC = [[XJMineUserInfoViewController alloc] init]; + + [self.navigationController pushViewController:infoVC animated:YES]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + + if ([tag isEqualToString:@"NUMBERAPI"]) { + + NSString * number = response; + + self.homeTable.number = [number integerValue]; + + } + + if ([tag isEqualToString:@"USERINFO"]) { + [self hiddenAllMBProgressHUD]; + NSDictionary * dic = response; + XJMineCenterUserModel * userModel = [XJMineCenterUserModel modelWithDictionary:dic]; + self.homeTable.userModel = userModel; + + } + +} +- (BOOL)shouldAutorotate { + + return NO; +} + +- (void)gotoLoginUserinfo { + + KPostNotification(KNotificationLoginStateChange, @NO); + +} + + + + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h new file mode 100644 index 0000000..ed20939 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.h @@ -0,0 +1,18 @@ +// +// XJSOSDetailInfoViewController.h +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSDetailInfoViewController : HQBaseViewController + +@property (nonatomic, copy) NSString * sessionId; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m new file mode 100644 index 0000000..54ed2bf --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailInfoViewController.m @@ -0,0 +1,75 @@ +// +// XJSOSDetailInfoViewController.m +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "XJSOSDetailInfoViewController.h" +#import "XJSOSDoctorDetailTable.h" +#import "XJSOSDoctorDetailInfoModel.h" + + +@interface XJSOSDetailInfoViewController () + +@property (nonatomic, strong) XJSOSDoctorDetailTable * homeTable; + +@end + +@implementation XJSOSDetailInfoViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.view.backgroundColor = CViewBgColor; + [self createUI]; + [self createData]; +} + +- (void)createUI { + + self.homeTable = [[XJSOSDoctorDetailTable alloc] initWithFrame:CGRectMake(kRealValue(10), kRealValue(58), kScreenWidth - kRealValue(20), kScreenHeight - kTopHeight - kRealValue(58)) style:UITableViewStyleGrouped]; + self.homeTable.layer.cornerRadius = 10.0; + self.homeTable.layer.masksToBounds = YES; + [self.view addSubview:self.homeTable]; +} + +- (void)createData { + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setValue:self.sessionId forKey:@"id"]; + + JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; + [detailApi getSOSDoctorDetailInfo:parmDic]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"DETAILAPI"]) { + NSDictionary * dic = response; + + XJSOSDoctorDetailInfoModel * model = [XJSOSDoctorDetailInfoModel modelWithDictionary:dic]; + + self.homeTable.model = model; + } + +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h new file mode 100644 index 0000000..2c2e55a --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.h @@ -0,0 +1,18 @@ +// +// XJSOSDetailSmallSumViewController.h +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSDetailSmallSumViewController : HQBaseViewController + +@property (nonatomic, copy) NSString * hospital_id; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h new file mode 100644 index 0000000..112a7c0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctorDetailViewController.h @@ -0,0 +1,22 @@ +// +// XJSOSLookDoctorDetailViewController.h +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSLookDoctorDetailViewController : HQBaseViewController + +@property (nonatomic, copy) NSString * sessionId; + +@property (nonatomic, copy) NSString * hospital_id; + + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h new file mode 100644 index 0000000..91299fe --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.h @@ -0,0 +1,16 @@ +// +// XJSOSLookDoctoreViewController.h +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSLookDoctoreViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m new file mode 100644 index 0000000..4c3da9a --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSLookDoctoreViewController.m @@ -0,0 +1,135 @@ +// +// XJSOSLookDoctoreViewController.m +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "XJSOSLookDoctoreViewController.h" +#import "XJSOSDoctorTableView.h" +#import "XJSOSDoctorModel.h" +#import "XJSOSLookDoctorDetailViewController.h" + +@interface XJSOSLookDoctoreViewController () + +@property (nonatomic, strong) XJSOSDoctorTableView * homeTable; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, assign) NSInteger pageNo; +@end + +@implementation XJSOSLookDoctoreViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + _dataArray = [[NSMutableArray alloc] init]; + } + return _dataArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.view.backgroundColor = CViewBgColor; + self.isHidenNaviBar = false; + self.navigationItem.title = @"应急就医"; + self.pageNo = 1; + [self createUI]; + [self createData]; + +} + +- (void)createUI { + + MJWeakSelf + self.homeTable = [[XJSOSDoctorTableView alloc] initWithFrame:CGRectMake(kRealValue(15), 0, kScreenWidth - kRealValue(30), kScreenHeight - kTopHeight) style:UITableViewStyleGrouped]; + + self.homeTable.recordBlock = ^(NSString * _Nonnull sessionId, NSString * _Nonnull hospitalId) { + XJSOSLookDoctorDetailViewController * detailVC = [[XJSOSLookDoctorDetailViewController alloc] init]; + detailVC.sessionId = hospitalId; + detailVC.hospital_id = hospitalId; + [weakSelf.navigationController pushViewController:detailVC animated:YES]; + }; + [self.view addSubview:self.homeTable]; + + + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + [self createData]; + + //初始化一个emptyView + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"boxNoData" titleStr:@"暂无数据" detailStr:@""]; + + //元素竖直方向的间距 + emptyView.subViewMargin = 20.f; + //标题颜色 + emptyView.titleLabTextColor = [UIColor blackColor]; + //描述字体 + emptyView.detailLabFont = [UIFont systemFontOfSize:17]; + //按钮背景色 + //设置空内容占位图 + self.homeTable.ly_emptyView = emptyView; +} + +- (void)createData { + + [self showMBProgressHUDWithString:@"数据加载中..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@"20" forKey:@"pageSize"]; + + JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"STATUSING" NeedToken:@""]; + + [api getSOSDoctorRecordList:parmDic]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + [self.homeTable.mj_header endRefreshing]; + [self.homeTable.mj_footer endRefreshing]; +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_header endRefreshing]; + [self.homeTable.mj_footer endRefreshing]; + if ([tag isEqualToString:@"STATUSING"]) { + [self hiddenAllMBProgressHUD]; + NSDictionary * dic = response; + + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } + + XJSOSDoctorModel * model = [XJSOSDoctorModel modelWithDictionary:dic] ; + [self.dataArray addObjectsFromArray:model.records]; + } + self.homeTable.dataArray = self.dataArray; + +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/MineCenterUserModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/MineCenterUserModel.m deleted file mode 100644 index 6746c54..0000000 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/MineCenterUserModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// MineCenterUserModel.m -// EscortProject -// -// Created by 仁康信息 on 2023/7/26. -// - -#import "MineCenterUserModel.h" - -@implementation MineCenterUserModel - -@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessDetailModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessDetailModel.h new file mode 100644 index 0000000..55d576b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessDetailModel.h @@ -0,0 +1,38 @@ +// +// XJBigillessDetailModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJBigillessDetailModel : NSObject + +@property (nonatomic, copy) NSString * detail_id; +@property (nonatomic, copy) NSString * hospitalId; +@property (nonatomic, copy) NSString * hospitalName; +@property (nonatomic, copy) NSString * medicalCardNo; +@property (nonatomic, copy) NSString * registerCategory; +@property (nonatomic, copy) NSString * registerCategory_dictText; +@property (nonatomic, copy) NSString * yiyuan_id; +@property (nonatomic, copy) NSString * state; +@property (nonatomic, copy) NSString * desireTime; +@property (nonatomic, copy) NSString * reservationOffice; +@property (nonatomic, copy) NSString * createTime; +@property (nonatomic, copy) NSString * reservationDoctor; +@property (nonatomic, copy) NSString * diseaseDescribe; +@property (nonatomic, copy) NSString * rejectionReason; +@property (nonatomic, copy) NSString * realname; +@property (nonatomic, copy) NSString * idNo; +@property (nonatomic, copy) NSString * telPhone; +@property (nonatomic, copy) NSString * reservationNo; +@property (nonatomic, copy) NSString * topState; +@property (nonatomic, copy) NSString * rejectionTime; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessDetailModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessDetailModel.m new file mode 100644 index 0000000..a68354c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessDetailModel.m @@ -0,0 +1,17 @@ +// +// XJBigillessDetailModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import "XJBigillessDetailModel.h" + +@implementation XJBigillessDetailModel ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"topState" :@"newState"}; + return dic; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessHospitalModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessHospitalModel.h new file mode 100644 index 0000000..90ea271 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessHospitalModel.h @@ -0,0 +1,19 @@ +// +// XJBigillessHospitalModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJBigillessHospitalModel : NSObject + +@property (nonatomic, copy) NSString * yiyuan_id; +@property (nonatomic, copy) NSString * name; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessHospitalModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessHospitalModel.m new file mode 100644 index 0000000..c9b6ef7 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillessHospitalModel.m @@ -0,0 +1,18 @@ +// +// XJBigillessHospitalModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import "XJBigillessHospitalModel.h" + +@implementation XJBigillessHospitalModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"yiyuan_id" :@"id"}; + return dic; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillnessModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillnessModel.h new file mode 100644 index 0000000..8ee4dda --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillnessModel.h @@ -0,0 +1,24 @@ +// +// XJBigillnessModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJBigillnessModel : NSObject + +@property (nonatomic, copy) NSString * zixun_id; +@property (nonatomic, copy) NSString * hospitalName; +@property (nonatomic, copy) NSString * reservationOffice; +@property (nonatomic, copy) NSString * reservationDoctor; +@property (nonatomic, copy) NSString * realname; +@property (nonatomic, copy) NSString * state ;// 状态 1未派单 2已派单 3已接单 4已预约 5已完成 6操作人员驳回 7驻场人员驳回 8 超时未接单 6,7,8红色 其余都是绿色 +@property (nonatomic, copy) NSString * createTime; +@property (nonatomic, copy) NSString * desireTime; +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillnessModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillnessModel.m new file mode 100644 index 0000000..78e733e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJBigillnessModel.m @@ -0,0 +1,19 @@ +// +// XJBigillnessModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import "XJBigillnessModel.h" + +@implementation XJBigillnessModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"zixun_id" :@"id"}; + return dic; +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJEmergencyContactModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJEmergencyContactModel.h new file mode 100644 index 0000000..1cdcfd7 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJEmergencyContactModel.h @@ -0,0 +1,23 @@ +// +// XJEmergencyContactModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/27. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJEmergencyContactModel : NSObject + +@property (nonatomic, copy) NSString * contact_ID; +@property (nonatomic, copy) NSString * phone; +@property (nonatomic, copy) NSString * familyRelation_dictText; +@property (nonatomic, copy) NSString * name; +@property (nonatomic, copy) NSString * idCard; +@property (nonatomic, copy) NSString * familyRelation; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJEmergencyContactModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJEmergencyContactModel.m new file mode 100644 index 0000000..2a5cbc2 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJEmergencyContactModel.m @@ -0,0 +1,19 @@ +// +// XJEmergencyContactModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/27. +// + +#import "XJEmergencyContactModel.h" + +@implementation XJEmergencyContactModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"contact_ID" :@"id"}; + return dic; +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJMineCenterUserModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJMineCenterUserModel.h new file mode 100644 index 0000000..b835132 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJMineCenterUserModel.h @@ -0,0 +1,30 @@ +// +// XJMineCenterUserModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJMineCenterUserModel : NSObject + +@property (nonatomic, copy) NSString * realname; +@property (nonatomic, copy) NSString * workNo; +@property (nonatomic, copy) NSString * phone; +@property (nonatomic, copy) NSString * idCard; +@property (nonatomic, copy) NSString * sex; +@property (nonatomic, copy) NSString * sex_dictText; +@property (nonatomic, copy) NSString * personType; +@property (nonatomic, copy) NSString * personType_dictText; +@property (nonatomic, copy) NSString * orgCode; +@property (nonatomic, copy) NSString * avatar; +@property (nonatomic, copy) NSString * value; +@property (nonatomic, copy) NSString * text; +@property (nonatomic, copy) NSString * title; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJMineCenterUserModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJMineCenterUserModel.m new file mode 100644 index 0000000..747dbc0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJMineCenterUserModel.m @@ -0,0 +1,12 @@ +// +// XJMineCenterUserModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import "XJMineCenterUserModel.h" + +@implementation XJMineCenterUserModel + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorDetailInfoModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorDetailInfoModel.h new file mode 100644 index 0000000..75bb783 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorDetailInfoModel.h @@ -0,0 +1,107 @@ +// +// XJSOSDoctorDetailInfoModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/23. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSDoctorDetailHistory : NSObject + +@property (nonatomic, copy) NSString * status; +@property (nonatomic, copy) NSString * stationUserId; +@property (nonatomic, copy) NSString * stationUserName; +@property (nonatomic, copy) NSString * stationUserSex; +@property (nonatomic, copy) NSString * accept_dictText; +@property (nonatomic, copy) NSString * updateTime; +@property (nonatomic, copy) NSString * stationBusiness_dictText; +@property (nonatomic, copy) NSString * sendOrderHospital; +@property (nonatomic, copy) NSString * orderId; +@property (nonatomic, copy) NSString * stationBusiness; +@property (nonatomic, copy) NSString * createTime; +@property (nonatomic, copy) NSString * createBy; +@property (nonatomic, copy) NSString * history_id; +@property (nonatomic, copy) NSString * transferOrderTime; + + +@end + +@interface XJSOSDoctorDetailInfoModel : NSObject + +@property (nonatomic, copy) NSString * createTimeEnd; +@property (nonatomic, copy) NSString * majorSalvageOpinion; +@property (nonatomic, copy) NSString * infoDesc; +@property (nonatomic, copy) NSString * delFlag; +@property (nonatomic, copy) NSString * detail_id; +@property (nonatomic, copy) NSString * initiatorUserDepart; +@property (nonatomic, copy) NSString * stationUserMobile; +@property (nonatomic, copy) NSString * memo; +@property (nonatomic, copy) NSString * orderDetail; +@property (nonatomic, copy) NSString * stationUserAvatar; + +@property (nonatomic, copy) NSString * updateBy; +@property (nonatomic, copy) NSString * sessionNow; +@property (nonatomic, copy) NSString * stationUserSex; +@property (nonatomic, copy) NSString * stationUserId; +@property (nonatomic, copy) NSString * isDispatch_dictText; +@property (nonatomic, copy) NSString * createBy; +@property (nonatomic, copy) NSString * stationRejectionTime; +@property (nonatomic, copy) NSString * initiatorUserName; +@property (nonatomic, copy) NSString * salvageUserAge; +@property (nonatomic, copy) NSString * createTime; + +@property (nonatomic, copy) NSString * resourceId; +@property (nonatomic, copy) NSString * operationUserSex; +@property (nonatomic, copy) NSString * stationBusiness; +@property (nonatomic, copy) NSString * majorUserSex; +@property (nonatomic, copy) NSString * status; +@property (nonatomic, copy) NSString * operationUserName; +@property (nonatomic, copy) NSString * stationUserDepart; +@property (nonatomic, copy) NSString * salvageUserSecondDepart; +@property (nonatomic, copy) NSString * majorUserId; +@property (nonatomic, copy) NSString * initiatorUserSex; + +@property (nonatomic, strong) NSArray * orderSendRecordList; + +@property (nonatomic, copy) NSString * stationBusiness_dictText; +@property (nonatomic, copy) NSString * majorResponseTime; +@property (nonatomic, copy) NSString * salvageUserMobile; +@property (nonatomic, copy) NSString * initiatorUserId; +@property (nonatomic, copy) NSString * orderStatus; +@property (nonatomic, copy) NSString * salvageUserAvatar; +@property (nonatomic, copy) NSString * initiatorType; +@property (nonatomic, copy) NSString * initiatorUserAge; +@property (nonatomic, copy) NSString * sessionId; + +@property (nonatomic, copy) NSString * salvageUserName; +@property (nonatomic, copy) NSString * initiatorUserMobile; +@property (nonatomic, copy) NSString * stationUserName; +@property (nonatomic, copy) NSString * updateTime; +@property (nonatomic, copy) NSString * operationUserMobile; +@property (nonatomic, copy) NSString * majorUserName; +@property (nonatomic, copy) NSString * isDispatch; +@property (nonatomic, copy) NSString * orderStatus_dictText; +@property (nonatomic, copy) NSString * resourceName; + +@property (nonatomic, copy) NSString * initiatorUserSecondDepart; +@property (nonatomic, copy) NSString * salvageUserDepart; +@property (nonatomic, copy) NSString * orderOverTime; +@property (nonatomic, copy) NSString * initiatorUserIdCard; +@property (nonatomic, copy) NSString * initiatorUserAvatar; +@property (nonatomic, copy) NSString * salvageUserId; +@property (nonatomic, copy) NSString * operationUserId; +@property (nonatomic, copy) NSString * operationResponseTime; +@property (nonatomic, copy) NSString * stationResponseTime; + +@property (nonatomic, copy) NSString * operationSendOrderTime; +@property (nonatomic, assign) BOOL isFill; +@property (nonatomic, copy) NSString * sendOrderHospital; +@property (nonatomic, copy) NSString * salvageUserIdCard; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorDetailInfoModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorDetailInfoModel.m new file mode 100644 index 0000000..1b78d0c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorDetailInfoModel.m @@ -0,0 +1,40 @@ +// +// XJSOSDoctorDetailInfoModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/23. +// + +#import "XJSOSDoctorDetailInfoModel.h" + + + +@implementation XJSOSDoctorDetailHistory + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"history_id" :@"id"}; + return dic; +} + + +@end + +@implementation XJSOSDoctorDetailInfoModel + ++ (NSDictionary *)modelContainerPropertyGenericClass +{ + + return @{ + @"orderSendRecordList":[XJSOSDoctorDetailHistory class] + }; +} + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"detail_id" :@"id"}; + return dic; +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorModel.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorModel.h new file mode 100644 index 0000000..12285a4 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorModel.h @@ -0,0 +1,38 @@ +// +// XJSOSDoctorModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + + + +@interface XJSOSDoctorRecordListModel : NSObject + +@property (nonatomic, copy) NSString * sos_id; +@property (nonatomic, copy) NSString * sessionId; +@property (nonatomic, copy) NSString * initiatorUserId; +@property (nonatomic, copy) NSString * initiatorUserName; +@property (nonatomic, copy) NSString * createTime; +@property (nonatomic, copy) NSString * initiatorUserSex; +@property (nonatomic, copy) NSString * orderStatus_dictText; +@property (nonatomic, copy) NSString * sendOrderHospital; +@property (nonatomic, copy) NSString * stationBusiness; +@property (nonatomic, copy) NSString * orderStatus; +@property (nonatomic, copy) NSString * stationBusiness_dictText; + +@end + + +@interface XJSOSDoctorModel : NSObject + +@property (nonatomic, strong) NSArray * records; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorModel.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorModel.m new file mode 100644 index 0000000..2f3fd8b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Model/XJSOSDoctorModel.m @@ -0,0 +1,37 @@ +// +// XJSOSDoctorModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "XJSOSDoctorModel.h" + + + +@implementation XJSOSDoctorRecordListModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"sos_id" :@"id"}; + return dic; +} + + +@end + + + +@implementation XJSOSDoctorModel + ++ (NSDictionary *)modelContainerPropertyGenericClass +{ + + return @{ + @"records":[XJSOSDoctorRecordListModel class] + }; +} + + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/BigillessTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/BigillessTableViewCell.h deleted file mode 100644 index 8c84106..0000000 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/BigillessTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// BigillessTableViewCell.h -// EscortProject -// -// Created by 仁康信息 on 2023/8/19. -// - -#import -#import "BigillnessModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface BigillessTableViewCell : UITableViewCell - -@property (nonatomic, strong) BigillnessModel * model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/HistoryOrderTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/HistoryOrderTableViewCell.h deleted file mode 100644 index d365bec..0000000 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/HistoryOrderTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// HistoryOrderTableViewCell.h -// EscortProject -// -// Created by 仁康信息 on 2023/8/23. -// - -#import -#import "SOSDoctorDetailInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface HistoryOrderTableViewCell : UITableViewCell - -@property (nonatomic, strong) SOSDoctorDetailHistory * historyModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/MineHeardTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/MineHeardTableViewCell.h deleted file mode 100644 index 0649c0c..0000000 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/MineHeardTableViewCell.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MineHeardTableViewCell.h -// EscortProject -// -// Created by 仁康信息 on 2023/7/26. -// - -#import -#import "MineCenterUserModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface MineHeardTableViewCell : UITableViewCell - -@property (nonatomic, strong) MineCenterUserModel * heardModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/SOSDetailTableHeardView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/SOSDetailTableHeardView.h deleted file mode 100644 index 28e98a5..0000000 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/SOSDetailTableHeardView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// SOSDetailTableHeardView.h -// EscortProject -// -// Created by 仁康信息 on 2023/8/22. -// - -#import -#import "SOSDoctorDetailInfoModel.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface SOSDetailTableHeardView : UIView - -@property (nonatomic, assign) CGFloat heradHeight; - -@property (nonatomic, strong) SOSDoctorDetailInfoModel * heardModel; -@property (nonatomic, strong) SOSDoctorDetailHistory * historyModel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/SOSDoctorDetailTable.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/SOSDoctorDetailTable.h deleted file mode 100644 index 5d22477..0000000 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/SOSDoctorDetailTable.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// SOSDoctorDetailTable.h -// EscortProject -// -// Created by 仁康信息 on 2023/8/23. -// - -#import -#import "SOSDoctorDetailInfoModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface SOSDoctorDetailTable : UITableView - -@property (nonatomic, strong) SOSDoctorDetailInfoModel * model; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigilessTopStatusView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigilessTopStatusView.h new file mode 100644 index 0000000..75c30ed --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigilessTopStatusView.h @@ -0,0 +1,25 @@ +// +// XJBigilessTopStatusView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJBigilessTopStatusView : UIView + +@property (nonatomic, assign) BOOL isSelected; + +@property (nonatomic, assign) BOOL isLast; + +@property (nonatomic, assign) NSInteger lastType; + +@property (nonatomic, copy) NSString * statusString; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigilessTopStatusView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigilessTopStatusView.m new file mode 100644 index 0000000..44d64c8 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigilessTopStatusView.m @@ -0,0 +1,120 @@ +// +// XJBigilessTopStatusView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/21. +// + +#import "XJBigilessTopStatusView.h" + + +@interface XJBigilessTopStatusView () + +@property (nonatomic, strong) UIButton * statusBtn; + +@property (nonatomic, strong) UILabel * statusLabel; + +@property (nonatomic, strong) UILabel * numberLabel; + + +@property (nonatomic, strong) UIImageView * statusView; + +@property (nonatomic, strong) UIView * lineView; + +@end + + +@implementation XJBigilessTopStatusView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +- (instancetype)initWithFrame:(CGRect)frame { + + if (self = [super initWithFrame:frame]) { + + [self createUI]; + } + + return self; +} + +- (void)createUI { + + self.statusBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(5), 0, kRealValue(38), kRealValue(38))]; + [self.statusBtn setImage:[UIImage imageNamed:@"statusTop_nomal"] forState:UIControlStateNormal]; + [self.statusBtn setImage:[UIImage imageNamed:@"statusTop_selected"] forState:UIControlStateSelected]; + [self addSubview:self.statusBtn]; + + + self.numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(5), 0, kRealValue(38), kRealValue(38))]; + self.numberLabel.textAlignment = NSTextAlignmentCenter; + self.numberLabel.font = SYSTEMFONT(13); + self.numberLabel.text = @"1"; + self.numberLabel.textColor = UIColorHex(#21BEBD); + [self addSubview:self.numberLabel]; + + + self.statusLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.statusBtn.bottom + 8, 60, 13)]; + self.statusLabel.textAlignment = NSTextAlignmentLeft; + self.statusLabel.font = SYSTEMFONT(13); + self.statusLabel.text = @"在线咨询"; + self.statusLabel.textColor = KWhiteColor; + [self addSubview:self.statusLabel]; + + self.statusView = [[UIImageView alloc] initWithFrame:CGRectMake(self.statusBtn.right + kRealValue(13) , kRealValue(13), 20, 7)]; + self.statusView.image = [UIImage imageNamed:@"line_selected"]; + self.statusView.hidden = true; + [self addSubview:self.statusView]; + + self.lineView = [[UIImageView alloc] initWithFrame:CGRectMake(self.statusBtn.right , kRealValue(19), kRealValue(24), 2)]; + self.lineView.backgroundColor = KWhiteColor; + self.lineView.hidden = true; + [self addSubview:self.lineView]; + +} + +- (void)setIsSelected:(BOOL)isSelected { + + _isSelected = isSelected; + + if (_isSelected) { + self.statusBtn.selected = true; + self.statusView.hidden = false; + self.lineView.hidden = true; + self.statusLabel.textColor = KWhiteColor; + } + else { + self.statusBtn.selected = false; + self.statusView.hidden = true; + self.lineView.hidden = false; + self.statusLabel.textColor = UIColorHex(#FBFBFB); + } +} + + +- (void)setLastType:(NSInteger)lastType { + + _lastType = lastType; + + if (_lastType == 3) { + self.lineView.hidden = YES; + self.statusView.hidden = YES; + } + self.numberLabel.text = [NSString stringWithFormat:@"%ld",_lastType + 1]; + +} + +- (void)setStatusString:(NSString *)statusString { + + _statusString = statusString; + + self.statusLabel.text = _statusString; + +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessListTable.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessListTable.h new file mode 100644 index 0000000..c0562e1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessListTable.h @@ -0,0 +1,22 @@ +// +// XJBigillessListTable.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef void(^lookDetailBlock)(NSString * card_id); + +@interface XJBigillessListTable : UITableView + +@property (nonatomic, strong) NSArray * dataArray; + +@property (nonatomic, copy) lookDetailBlock detailBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessListTable.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessListTable.m new file mode 100644 index 0000000..ff020a1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessListTable.m @@ -0,0 +1,137 @@ +// +// XJBigillessListTable.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/19. +// + +#import "XJBigillessListTable.h" +#import "XJBigillessTableViewCell.h" + + +@interface XJBigillessListTable () + + +@end + + +@implementation XJBigillessListTable + + +- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style { + + if (self = [super initWithFrame:frame style:style]) { + + [self createUI]; + } + + return self; +} + +- (void)createUI { + + if (@available(iOS 11.0, *)) { + self.estimatedRowHeight = 0; + self.estimatedSectionFooterHeight = 0; + self.estimatedSectionHeaderHeight = 0; + self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.delegate = self; + self.dataSource = self; + self.backgroundColor = UIColor.clearColor; + self.showsVerticalScrollIndicator = false; + self.showsHorizontalScrollIndicator = false; + self.separatorStyle = UITableViewCellSeparatorStyleNone; + self.estimatedRowHeight = 60; + self.rowHeight = UITableViewAutomaticDimension; + +} + +- (void)setDataArray:(NSArray *)dataArray { + + _dataArray = dataArray; + + [self reloadData]; +} + +#pragma mark - tableview的代理方法 +//组数 +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return self.dataArray.count; +} +//每组多少行 +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 1; +} +//注册cell +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + + XJBigillessTableViewCell * cell = [self dequeueReusableCellWithIdentifier:@"STATUSCELL"]; + if (!cell) { + + cell = [[XJBigillessTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"STATUSCELL"]; + } + cell.model= self.dataArray[indexPath.section]; + cell.backgroundColor = KWhiteColor; + cell.layer.cornerRadius = 10; + cell.layer.masksToBounds = YES; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + return cell; + + + +} +//每行高度 +//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +//{ +// return kRealValue(77); +//} + +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + + return kRealValue(10); +} + +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { + + return CGFLOAT_MIN; +} + +//组头 --- 组尾 + +- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { + + + return [UIView new]; + +} + + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + + + UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(10))]; + + + return footerView; + +} +////cell点击事件 +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + XJBigillnessModel * model= self.dataArray[indexPath.section]; + + if (self.detailBlock) { + self.detailBlock(model.zixun_id); + } +} + + +@end + + + diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessTableViewCell.h new file mode 100644 index 0000000..87ee71b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessTableViewCell.h @@ -0,0 +1,18 @@ +// +// XJBigillessTableViewCell.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/19. +// + +#import +#import "XJBigillnessModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface XJBigillessTableViewCell : UITableViewCell + +@property (nonatomic, strong) XJBigillnessModel * model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessTableViewCell.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessTableViewCell.m new file mode 100644 index 0000000..7c6c669 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJBigillessTableViewCell.m @@ -0,0 +1,193 @@ +// +// XJBigillessTableViewCell.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/19. +// + +#import "XJBigillessTableViewCell.h" + +@interface XJBigillessTableViewCell() + +@property (nonatomic, strong) UILabel * hospitalLabel; + +@property (nonatomic, strong) UILabel * roomLabel; + +@property (nonatomic, strong) UILabel * doctorLabel; + +@property (nonatomic, strong) UILabel * peopleLabel; + +@property (nonatomic, strong) UILabel * timeLabel; + +@property (nonatomic, strong) UILabel * statusLabel; + +@end + +@implementation XJBigillessTableViewCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + + [self createUI]; + } + + return self; + +} + +- (void)createUI { + + self.hospitalLabel = [[UILabel alloc] init]; + self.hospitalLabel.textColor = UIColorHex(#333333); + self.hospitalLabel.font = BOLDSYSTEMFONT(14); + self.hospitalLabel.textAlignment = NSTextAlignmentLeft; + self.hospitalLabel.text = @"预约医院："; + [self.contentView addSubview:self.hospitalLabel]; + + [self.hospitalLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(14); + make.top.mas_offset(16); + make.height.mas_offset(14); + }]; + [self.hospitalLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + + + self.roomLabel = [[UILabel alloc] init]; + self.roomLabel.textColor = UIColorHex(#333333); + self.roomLabel.font = SYSTEMFONT(13); + self.roomLabel.textAlignment = NSTextAlignmentLeft; + self.roomLabel.text = @"预约科室："; + [self.contentView addSubview:self.roomLabel]; + + + [self.roomLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(14); + make.top.mas_equalTo(self.hospitalLabel.mas_bottom).offset(14); + make.height.mas_offset(14); + make.right.mas_offset (0); + }]; + + + self.doctorLabel = [[UILabel alloc] init]; + self.doctorLabel.textColor = UIColorHex(#333333); + self.doctorLabel.font = SYSTEMFONT(14); + self.doctorLabel.textAlignment = NSTextAlignmentLeft; + self.doctorLabel.text = @"预约医生："; + [self.contentView addSubview:self.doctorLabel]; + + [self.doctorLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(14); + make.top.mas_equalTo(self.roomLabel.mas_bottom).offset(14); + make.height.mas_offset(14); + make.right.mas_offset (0); + }]; + + self.peopleLabel = [[UILabel alloc] init]; + self.peopleLabel.textColor = UIColorHex(#333333); + self.peopleLabel.font = SYSTEMFONT(14); + self.peopleLabel.text = @"预约人："; + self.peopleLabel.textAlignment = NSTextAlignmentLeft; + [self.contentView addSubview:self.peopleLabel]; + + [self.peopleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(14); + make.top.mas_equalTo(self.doctorLabel.mas_bottom).offset(14); + make.height.mas_offset(14); + make.right.mas_offset (0); + make.bottom.mas_offset(-15); + }]; + + self.timeLabel = [[UILabel alloc] init]; + self.timeLabel.textColor = UIColorHex(#999999); + self.timeLabel.font = SYSTEMFONT(13); + self.timeLabel.textAlignment = NSTextAlignmentRight; + [self.contentView addSubview:self.timeLabel]; + + [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(@17); + make.height.mas_offset(12); + make.right.mas_offset (-17); + }]; + + self.statusLabel = [[UILabel alloc] init]; + self.statusLabel.textColor = UIColorHex(#16C716); + self.statusLabel.font = SYSTEMFONT(14); + self.statusLabel.textAlignment = NSTextAlignmentRight; + self.statusLabel.text = @"待派单"; + [self.contentView addSubview:self.statusLabel]; + + [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(self.timeLabel.mas_right); + make.top.mas_equalTo(self.timeLabel.mas_bottom).offset(28); + make.height.mas_offset(12); + make.right.mas_offset (-17); + }]; +} +- (void)setModel:(XJBigillnessModel *)model { + + _model = model; + + self.hospitalLabel.text = [NSString stringWithFormat:@"预约医院：%@",model.hospitalName] ; + self.roomLabel.text = [NSString stringWithFormat:@"预约科室：%@",model.reservationOffice]; + self.doctorLabel.text = [NSString stringWithFormat:@"预约医生：%@",model.reservationDoctor]; + self.peopleLabel.text = [NSString stringWithFormat:@"预约人：%@",model.realname]; + self.timeLabel.text = model.createTime; + //状态 1未派单 2已派单 3已接单 4已预约 5已完成 6操作人员驳回 7驻场人员驳回 8 超时未接单 6,7,8红色 其余都是绿色 + if ([_model.state integerValue] == 1 ) { + + self.statusLabel.text =@"待派单"; + self.statusLabel.textColor = UIColorHex(#16C716); + } + if ([_model.state integerValue] == 2 ) { + + self.statusLabel.text =@"已派单"; + self.statusLabel.textColor = UIColorHex(#16C716); + } + if ([_model.state integerValue] == 3 ) { + + self.statusLabel.text =@"已接单"; + self.statusLabel.textColor = UIColorHex(#16C716); + } + if ([_model.state integerValue] == 4 ) { + + self.statusLabel.text =@"已预约"; + self.statusLabel.textColor = UIColorHex(#16C716); + } + if ([_model.state integerValue] == 5 ) { + + self.statusLabel.text =@"已完成"; + self.statusLabel.textColor = UIColorHex(#16C716); + } + if ([_model.state integerValue] == 6 ) { + + self.statusLabel.text =@"被驳回"; + self.statusLabel.textColor = KRedColor; + + + } + if ([_model.state integerValue] == 7 ) { + + self.statusLabel.text =@"被驳回"; + self.statusLabel.textColor = KRedColor; + + + } + if ([_model.state integerValue] == 8 ) { + + self.statusLabel.text =@"未响应"; + self.statusLabel.textColor = KRedColor; + } +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJHistoryOrderTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJHistoryOrderTableViewCell.h new file mode 100644 index 0000000..81b99b0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJHistoryOrderTableViewCell.h @@ -0,0 +1,18 @@ +// +// XJHistoryOrderTableViewCell.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/23. +// + +#import +#import "XJSOSDoctorDetailInfoModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface XJHistoryOrderTableViewCell : UITableViewCell + +@property (nonatomic, strong) XJSOSDoctorDetailHistory * historyModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJHistoryOrderTableViewCell.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJHistoryOrderTableViewCell.m new file mode 100644 index 0000000..35948e9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJHistoryOrderTableViewCell.m @@ -0,0 +1,101 @@ +// +// XJHistoryOrderTableViewCell.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/23. +// + +#import "XJHistoryOrderTableViewCell.h" + +@implementation XJHistoryOrderTableViewCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + + [self createUI]; + } + + return self; +} + +- (void)createUI { + + + NSArray * leftInfoArray = @[@"派单时间",@"当前状态",@"派单业务",@"派单医院",@"驻场人员",@"转单时间"]; + UIView * linTwoView; + for (int j = 0; j < leftInfoArray.count; j ++) { + + UIView * orderView = [self orderInfoLabelViewWithFrame:CGRectMake(0, kRealValue(5) + kRealValue(25) * j, kScreenWidth - kRealValue(22), kRealValue(25)) withLeftText:leftInfoArray[j] withRightLabTag:300 + j]; + [self addSubview:orderView]; + if (j == leftInfoArray.count - 1) { + linTwoView = [[UIView alloc] initWithFrame:CGRectMake(0, orderView.bottom + kRealValue(8), kScreenWidth - kRealValue(22), 1)]; + linTwoView.backgroundColor = UIColorHex(#E0E0E0); + } + [self addSubview:linTwoView]; + } + +} + +- (UIView *)orderInfoLabelViewWithFrame:(CGRect)frame + withLeftText:(NSString *)leftText + withRightLabTag:(NSInteger)rightTag { + + UIView * labeView = [[UIView alloc] initWithFrame:frame]; + + UILabel * leftLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(14), 0, 80, kRealValue(25))]; + leftLabel.textColor = UIColorHex(#666666); + leftLabel.font = SYSTEMFONT(13); + leftLabel.textAlignment = NSTextAlignmentLeft; + leftLabel.text = leftText; + [labeView addSubview:leftLabel]; + + + UILabel * rightLabel = [[UILabel alloc] initWithFrame:CGRectMake(kScreenWidth - kRealValue(22) - 200 - kRealValue(14), 0, 200, kRealValue(25))]; + rightLabel.textColor = UIColorHex(#333333); + rightLabel.font = SYSTEMFONT(13); + rightLabel.textAlignment = NSTextAlignmentRight; + rightLabel.text = leftText; + rightLabel.tag = rightTag; + [labeView addSubview:rightLabel]; + + return labeView; + +} + +- (void)setHistoryModel:(XJSOSDoctorDetailHistory *)historyModel { + + _historyModel = historyModel; + + UILabel * timeLabel = [self viewWithTag:300]; + timeLabel.text = _historyModel.createTime; + + UILabel * currentStatusLabel = [self viewWithTag:301]; + currentStatusLabel.text = _historyModel.accept_dictText; + + UILabel * yewuLabel = [self viewWithTag:302]; + yewuLabel.text = _historyModel.stationBusiness_dictText; + + UILabel * hospitalLabel = [self viewWithTag:303]; + hospitalLabel.text = _historyModel.sendOrderHospital; + + UILabel * zhuchangLabel = [self viewWithTag:304]; + zhuchangLabel.text = _historyModel.stationUserName; + + UILabel * zhuangTimeLabel = [self viewWithTag:305]; + zhuangTimeLabel.text = _historyModel.transferOrderTime; +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineHeardTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineHeardTableViewCell.h new file mode 100644 index 0000000..7ff4272 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineHeardTableViewCell.h @@ -0,0 +1,18 @@ +// +// XJMineHeardTableViewCell.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import +#import "XJMineCenterUserModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface XJMineHeardTableViewCell : UITableViewCell + +@property (nonatomic, strong) XJMineCenterUserModel * heardModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineHeardTableViewCell.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineHeardTableViewCell.m new file mode 100644 index 0000000..e0befd6 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineHeardTableViewCell.m @@ -0,0 +1,77 @@ +// +// XJMineHeardTableViewCell.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import "XJMineHeardTableViewCell.h" + +@interface XJMineHeardTableViewCell () + +@property (nonatomic, strong) UILabel * headLabel; + +@property (nonatomic, strong) UIImageView * heardImage ; + +@end + +@implementation XJMineHeardTableViewCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + + [self createUI]; + } + return self; +} + +- (void)createUI { + + self.headLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 24, 100, 14)]; + self.headLabel.textColor = UIColorHex(#666666); + self.headLabel.text = @"头像"; + self.headLabel.font = MEDIUMFONT(14); + self.headLabel.textAlignment = NSTextAlignmentLeft; + [self.contentView addSubview:self.headLabel]; + + self.heardImage = [[UIImageView alloc] initWithFrame:CGRectMake(kScreenWidth - 33 - 45, 8, 45, 45)]; + self.heardImage.layer.cornerRadius = 22.0; + self.heardImage.layer.masksToBounds = YES; + [self.contentView addSubview:self.heardImage]; +} + +- (void)setHeardModel:(XJMineCenterUserModel *)heardModel { + + _heardModel = heardModel; + + NSString * photo = [NSString stringWithFormat:@"%@%@",ResourceAddress,_heardModel.avatar]; + + NSString * str1 = @"\\"; + + photo = [ photo stringByReplacingOccurrencesOfString:str1 withString:@"/"]; + + NSString *encodedString3 = CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef) photo, (CFStringRef)@"!$&'()*+,-./:;=?@_~%#[]", NULL, kCFStringEncodingUTF8)); + if ([_heardModel.sex integerValue] == 1) { //女[] + [self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:[UIImage imageNamed:@"heard_woman"]]; + + }else + { + [self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:[UIImage imageNamed:@"heard_man"]]; + + } +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineUserInfoTable.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineUserInfoTable.h new file mode 100644 index 0000000..ed2479b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineUserInfoTable.h @@ -0,0 +1,29 @@ +// +// XJMineUserInfoTable.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import +#import "XJMineCenterUserModel.h" +#import "XJEmergencyContactModel.h" + +NS_ASSUME_NONNULL_BEGIN + +typedef void(^addContactBlock)(); + +typedef void(^editContactMode)(XJEmergencyContactModel * model); + +@interface XJMineUserInfoTable : UITableView + +@property (nonatomic, strong) XJMineCenterUserModel * model; + +@property (nonatomic, copy) addContactBlock addBlcok; +@property (nonatomic, copy) editContactMode editBlcok; + +@property (nonatomic, strong) NSArray * dataArray; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineUserInfoTable.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineUserInfoTable.m new file mode 100644 index 0000000..4d56d36 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMineUserInfoTable.m @@ -0,0 +1,265 @@ +// +// XJMineUserInfoTable.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/7/26. +// + +#import "XJMineUserInfoTable.h" +#import "XJMineHeardTableViewCell.h" +#import "XJEmergencyContactModel.h" + +@interface XJMineUserInfoTable () + + +@end + +@implementation XJMineUserInfoTable + +- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style +{ + if (self = [super initWithFrame:frame style:style]) + { + [self createUI]; + } + return self; +} + + +- (void)createUI +{ + if ([[UIDevice currentDevice].systemVersion floatValue] >= 11) { + self.estimatedRowHeight = 0; + self.estimatedSectionFooterHeight = 0; + self.estimatedSectionHeaderHeight = 0; + self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.delegate = self; + self.backgroundColor = CViewBgColor; + self.dataSource = self; + self.separatorStyle = UITableViewCellSeparatorStyleSingleLine; + self.showsVerticalScrollIndicator = NO; +} + +- (void)setModel:(XJMineCenterUserModel *)model { + + _model = model; + + [self reloadData]; + +} + +- (void)setDataArray:(NSArray *)dataArray { + + _dataArray = dataArray; + [self reloadData]; + +} + + +#pragma mark - DataSource +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + if (section == 0) { + return 8; + } + return self.dataArray.count; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 2; + +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + if (indexPath.section == 0) { + //头像 + if (indexPath.row == 0) { + + XJMineHeardTableViewCell * heardCell = [tableView dequeueReusableCellWithIdentifier:@"HEARDCELL"]; + + if (!heardCell) { + heardCell = [[XJMineHeardTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"HEARDCELL"]; + } + heardCell.backgroundColor = KWhiteColor; + heardCell.heardModel = self.model; + heardCell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + return heardCell; + + }else + { + NSArray * sectionOne = @[@"姓名",@"性别",@"工号",@"手机号",@"身份证号",@"人员类型",@"所属部门"]; + NSArray * sectionTwo ; + NSString * workNo = @"--"; + NSString * sex_dictText = @"--"; + NSString * realname = @"--"; + NSString * phone = @"--"; + NSString * idCard = @"--"; + NSString * personType_dictText = @"--"; + NSString * orgCode = @"--"; + + if (!ValidStr(self.model.workNo)) { + workNo = [NSString stringWithFormat:@"%@",self.model.workNo]; + + } + if (!ValidStr(self.model.realname)) { + realname = [NSString stringWithFormat:@"%@",self.model.realname]; + + } + if (!ValidStr(self.model.sex_dictText)) { + sex_dictText = [NSString stringWithFormat:@"%@",self.model.sex_dictText]; + + } + if (!ValidStr(self.model.phone)) { + phone = [NSString stringWithFormat:@"%@",self.model.phone]; + + } + if (!ValidStr(self.model.idCard)) { + idCard = [NSString stringWithFormat:@"%@",self.model.idCard]; + + } + if (!ValidStr(self.model.personType_dictText)) { + personType_dictText = [NSString stringWithFormat:@"%@",self.model.personType_dictText]; + + } + if (!ValidStr(self.model.orgCode)) { + orgCode = [NSString stringWithFormat:@"%@",self.model.orgCode]; + + } + sectionTwo = @[realname,sex_dictText,workNo,phone,idCard,personType_dictText,orgCode]; + + static NSString * cellID = @"cellID"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; + + if (!cell) { + + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cellID]; + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.textLabel.font = SYSTEMFONT(14); + if (self.model) { + cell.detailTextLabel.text = sectionTwo[indexPath.row - 1]; + } + cell.textLabel.text = sectionOne[indexPath.row - 1]; + cell.textLabel.textColor = UIColorHex(#666666); + cell.textLabel.font = SYSTEMFONT(14); + cell.detailTextLabel.font = SYSTEMFONT(14); + cell.detailTextLabel.textColor = UIColorHex(#333333); + cell.backgroundColor = KWhiteColor; + return cell; + + } + } + if (indexPath.section == 1) { + + XJEmergencyContactModel * model = self.dataArray[indexPath.row]; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CONNETCELL"]; + + if (!cell) { + + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CONNETCELL"]; + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.textLabel.font = SYSTEMFONT(14); + cell.textLabel.text = [NSString stringWithFormat:@"%@-%@",model.name,model.phone]; + return cell; + + + } + + + return UITableViewCell.new; + +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + + if (indexPath.section == 0) { + if (indexPath.row == 0) { + return 62; + }else + { + return 45; + } + } + return 46; + +} + +- (CGFloat )tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + if (section == 1) { + return 50; + } + return CGFLOAT_MIN; +} + + +- (CGFloat )tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return CGFLOAT_MIN; +} + + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + if (section == 1) { + + UIView * sectionHeardView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 50)]; + sectionHeardView.backgroundColor = CViewBgColor; + + UIView * labView = [[UIView alloc] initWithFrame:CGRectMake(0, 10, kScreenWidth, 40)]; + labView.backgroundColor = KWhiteColor; + [sectionHeardView addSubview:labView]; + + UILabel * heardLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, 0, 200, 40)]; + heardLabel.text = @"紧急联系人"; + heardLabel.textColor = UIColorHex(#666666); + heardLabel.font = SYSTEMFONT(14); + + heardLabel.textAlignment = NSTextAlignmentLeft; + [labView addSubview:heardLabel]; + + UIButton * addBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth - 18 - 40, 12, 40, 13)]; + [addBtn setTitle:@"新增" forState:UIControlStateNormal]; + addBtn.titleLabel.textAlignment = NSTextAlignmentRight; + [addBtn setTitleColor:UIColorHex(#3390FF) forState:UIControlStateNormal]; + addBtn.titleLabel.font = SYSTEMFONT(13); + [addBtn addTarget:self action:@selector(addEmergencyContact) forControlEvents:UIControlEventTouchUpInside]; + [labView addSubview:addBtn]; + + return sectionHeardView; + } + + return UIView.new; + +} + +- (void)addEmergencyContact { + + if (self.addBlcok) { + self.addBlcok(); + } +} + + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + + if (indexPath.section == 1) { + + XJEmergencyContactModel * model = self.dataArray[indexPath.row]; + + self.editBlcok(model); + } + + + +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.h new file mode 100644 index 0000000..17ea9ff --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.h @@ -0,0 +1,50 @@ +// +// XJMyCenterHeardView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/23. +// + +#import +#import "XJMineCenterUserModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@protocol myCenterHeardToolsDelegate + +/* + 进行中 + */ +- (void)myCenterInProgress; +/* + 待评价 + */ +- (void)waitEvaluation; +/* + 已评价 + */ +- (void)completeEvaluation; +/* + 历史 + */ +- (void)myHistoryAction; + +//查看全部 +- (void)lookAllQuestion; + +- (void)heardImageOnClick; + +@end + + +@interface XJMyCenterHeardView : UIView + +@property (nonatomic, weak)id heardDelegate; + +@property (nonatomic, assign) NSInteger number; + +@property (nonatomic, strong) XJMineCenterUserModel * heardModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m new file mode 100644 index 0000000..e1e3f9b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m @@ -0,0 +1,203 @@ +// +// XJMyCenterHeardView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/23. +// + +#import "XJMyCenterHeardView.h" + +@interface XJMyCenterHeardView () + +@property (nonatomic, strong) UIImageView * heardImage; + +@property (nonatomic, strong) UILabel * nameLabel; + +@property (nonatomic, strong) UILabel * numberLabel; + +@property (nonatomic, strong) YYLabel * lookMoreLabel; + +@end + + + +@implementation XJMyCenterHeardView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +- (instancetype)initWithFrame:(CGRect)frame { + + if (self = [super initWithFrame:frame]) { + + [self createUI]; + } + + return self; +} + +- (void)createUI { + + UIImageView * heardImg = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(26), - kRealValue(16) , 52, 52)]; + self.heardImage = heardImg; + heardImg.layer.cornerRadius = 26; + heardImg.layer.masksToBounds = true; + heardImg.userInteractionEnabled = true; + heardImg.image = [UIImage imageNamed:@"heard_woman"] ; + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(heardImageAction)]; + [heardImg addGestureRecognizer:tap]; + [self addSubview:heardImg]; + + self.nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.heardImage.right + kRealValue(8), kRealValue(10), self.width - self.heardImage.right - kRealValue(10), 15)]; + self.nameLabel.textColor = CFontColor1; + self.nameLabel.font = SYSTEMFONT(15); + self.nameLabel.textAlignment = NSTextAlignmentLeft; + self.nameLabel.text = @"未登录"; + [self addSubview:self.nameLabel]; + + self.lookMoreLabel = [[YYLabel alloc] initWithFrame:CGRectMake(kScreenWidth - kRealValue(100), kRealValue(10), kRealValue(60), 15)]; + self.lookMoreLabel.textColor = CFontColor1; + self.lookMoreLabel.font = SYSTEMFONT(13); + self.lookMoreLabel.textAlignment = NSTextAlignmentRight; + self.lookMoreLabel.text = @"查看更多>"; + MJWeakSelf + [self.lookMoreLabel setTextTapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + if ([weakSelf.heardDelegate respondsToSelector:@selector(lookAllQuestion)]) { + [weakSelf.heardDelegate lookAllQuestion]; + } + }]; + [self addSubview:self.lookMoreLabel]; + + + NSArray * array = @[@[@"进行中",@"HeardProgress_icon"],@[@"待评价",@"waitEveal_icon"],@[@"已评价",@"alreadyEveal"],@[@"历史",@"HeardHistory_icon"]]; + + CGFloat w = 58 ; + + for (int i = 0 ; i < 4; i++) { + + UIView * heardView = [[UIView alloc] initWithFrame:CGRectMake(i * (kScreenWidth - kRealValue(30))/4, self.heardImage.bottom + kRealValue(18),(kScreenWidth - kRealValue(30))/4, self.height - self.heardImage.bottom - kRealValue(18))]; + [self addSubview:heardView]; + + UIImageView * toolsImg = [[UIImageView alloc] initWithFrame:CGRectMake((heardView.width / 2 - 29 ) , kRealValue(18), w, w)]; + toolsImg.image = [UIImage imageNamed:array[i][1]]; + toolsImg.userInteractionEnabled = true; + + if (i == 0) + { + UILabel * numLabel = [[UILabel alloc] initWithFrame:CGRectMake(toolsImg.width - 16, -2, 18, 18)]; + numLabel.text = @"1"; + numLabel.textColor = KWhiteColor; + numLabel.font = SYSTEMFONT(13); + numLabel.textAlignment = NSTextAlignmentCenter; + numLabel.backgroundColor = KRedColor; + numLabel.layer.borderColor = UIColor.whiteColor.CGColor; + numLabel.layer.borderWidth = 1.0f; + numLabel.layer.cornerRadius = 9.0; + numLabel.layer.masksToBounds = YES; + self.numberLabel = numLabel; + numLabel.hidden = YES; + [toolsImg addSubview:numLabel]; + } + [heardView addSubview:toolsImg]; + + UILabel * toolsLabel = [[UILabel alloc] initWithFrame:CGRectMake(0 ,toolsImg.bottom + kRealValue(5), heardView.width, 15)]; + toolsLabel.textColor = CFontColor1; + toolsLabel.font = SYSTEMFONT(13); + toolsLabel.text = array[i][0]; + toolsLabel.textAlignment = NSTextAlignmentCenter; + [heardView addSubview:toolsLabel]; + + UIButton * heardBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, heardView.width, 80)]; + [heardBtn addTarget:self action:@selector(heardToolsAction:) forControlEvents:UIControlEventTouchUpInside]; + heardBtn.tag = 100 + i; + [heardView addSubview:heardBtn]; + + + } + + +} + +- (void)heardToolsAction:(UIButton *)toolsBtn { + + + + if (toolsBtn.tag == 100) { + + if ([self.heardDelegate respondsToSelector:@selector(myCenterInProgress)]) { + [self.heardDelegate myCenterInProgress]; + } + } + if (toolsBtn.tag == 101) { + + if ([self.heardDelegate respondsToSelector:@selector(waitEvaluation)]) { + [self.heardDelegate waitEvaluation]; + } + } + if (toolsBtn.tag == 102) { + + if ([self.heardDelegate respondsToSelector:@selector(completeEvaluation)]) { + [self.heardDelegate completeEvaluation]; + } + } + if (toolsBtn.tag == 103) { + + if ([self.heardDelegate respondsToSelector:@selector(myHistoryAction)]) { + [self.heardDelegate myHistoryAction]; + } + } + + +} + +- (void)setNumber:(NSInteger )number { + _number = number; + + if (number == 0) { + self.numberLabel.hidden = YES; + }else + { + self.numberLabel.hidden = false; + self.numberLabel.text = [NSString stringWithFormat:@"%ld",number]; + } + +} + +- (void)setHeardModel:(XJMineCenterUserModel *)heardModel { + + _heardModel = heardModel; + + NSString * photo = [NSString stringWithFormat:@"%@%@",ResourceAddress,_heardModel.avatar]; + NSString * str1 = @"\\"; + + photo = [ photo stringByReplacingOccurrencesOfString:str1 withString:@"/"]; + + NSString *encodedString3 = CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef) photo, (CFStringRef)@"!$&'()*+,-./:;=?@_~%#[]", NULL, kCFStringEncodingUTF8)); + + self.nameLabel.text = _heardModel.realname; + + if ([_heardModel.sex integerValue] == 1) { //女[] + [self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:[UIImage imageNamed:@"heard_woman"]]; + + }else + { + [self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:[UIImage imageNamed:@"heard_man"]]; + + } + + +} + +- (void)heardImageAction { + + if ([self.heardDelegate respondsToSelector:@selector(heardImageOnClick)]) { + [self.heardDelegate heardImageOnClick]; + } + +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.h new file mode 100644 index 0000000..9520636 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.h @@ -0,0 +1,33 @@ +// +// XJMyCenterTableView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/23. +// + +#import +#import "XJMyCenterHeardView.h" +#import "XJMineCenterUserModel.h" + +NS_ASSUME_NONNULL_BEGIN +@protocol cenerCellListDelegate + +- (void)cellListClick:(NSInteger)cellIndex; + +@end + +@interface XJMyCenterTableView : UITableView + +@property (nonatomic, strong) NSArray * dataArray; + +@property (nonatomic, weak)id heardDelegate; + +@property (nonatomic, weak)id cellDelegate; + +@property (nonatomic, assign) NSInteger number; + +@property (nonatomic, strong) XJMineCenterUserModel * userModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m new file mode 100644 index 0000000..f069ab0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m @@ -0,0 +1,264 @@ +// +// XJMyCenterTableView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/23. +// + +#import "XJMyCenterTableView.h" +#import "XJMyCenterHeardView.h" + +@interface XJMyCenterTableView () + +@property (nonatomic, strong) XJMyCenterHeardView * heardV; + +@end + +@implementation XJMyCenterTableView + +- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style +{ + if (self = [super initWithFrame:frame style:style]) + { + [self createUI]; + } + return self; +} + + +- (void)createUI +{ + if (@available(iOS 11.0, *)) { + self.estimatedRowHeight = 0; + self.estimatedSectionFooterHeight = 0; + self.estimatedSectionHeaderHeight = 0; + self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.delegate = self; + self.backgroundColor = KClearColor; + self.dataSource = self; + self.tableHeaderView = [self createHeardView]; + self.separatorStyle = UITableViewCellSeparatorStyleNone; + self.showsVerticalScrollIndicator = NO; +} + +- (void)setDataArray:(NSArray *)dataArray +{ + _dataArray = dataArray; + [self reloadData]; +} + +- (void)setHeardDelegate:(id)heardDelegate { + + _heardDelegate = heardDelegate; + + self.heardV.heardDelegate = _heardDelegate; +} + +- (void)setUserModel:(XJMineCenterUserModel *)userModel { + + _userModel = userModel; + + self.heardV.heardModel = _userModel; + +} + + +- (void)setNumber:(NSInteger)number { + _number = number; + + self.heardV.number = _number; +} + +- (UIView *)createHeardView +{ + XJMyCenterHeardView * heardV = [[XJMyCenterHeardView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(150))]; + heardV.layer.cornerRadius = 10; + heardV.backgroundColor = KWhiteColor; + heardV.heardDelegate = self.heardDelegate; + [HQCommonUtils addShadowToView:heardV]; + self.heardV = heardV; + return heardV; +} + + + + +#pragma mark - DataSource +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + + return 2; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 1; + +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + //,@[@"我的关注",@"myLove_icon"] + NSArray *sectionOne = @[ + @[@"咨询人管理", @"relatives_icon"], + @[@"应急就医", @"medicalReson_icon"] + ]; + + static NSString * cellID = @"cellID"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID]; + + if (!cell) { + + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.textLabel.font = SYSTEMFONT(14); + cell.textLabel.text = sectionOne[indexPath.row][0]; +// cell.imageView.image = [UIImage imageNamed: sectionOne[indexPath.row][1]]; + // 安全判断 + if (indexPath.row < sectionOne.count) { + NSArray *item = sectionOne[indexPath.row]; + if (item.count >= 2) { + cell.textLabel.text = item[0]; + cell.imageView.image = [UIImage imageNamed:item[1]]; + } + } else { + cell.textLabel.text = @"--"; + cell.imageView.image = nil; + } + return cell; + +} + + + +- (CGFloat )tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return kRealValue(10); +} + + +- (CGFloat )tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return CGFLOAT_MIN; +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + + return kRealValue(52); +} + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + UIView * sectionHeardView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(10))]; + sectionHeardView.backgroundColor = KClearColor; + return sectionHeardView; + +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + + + + if ([self.cellDelegate respondsToSelector:@selector(cellListClick:)] ) { + + [self.cellDelegate cellListClick:indexPath.row]; + } + + + +} + +- (void)tableView:(UITableView*)tableView willDisplayCell:(UITableViewCell*)cell forRowAtIndexPath:(NSIndexPath*)indexPath + +{ + + if([cell respondsToSelector:@selector(tintColor)]) { + + if(tableView ==self) { + + CGFloat cornerRadius =5.f; + + cell.backgroundColor=UIColor.clearColor; + + CAShapeLayer * layer = [[CAShapeLayer alloc]init]; + + CGMutablePathRef pathRef = CGPathCreateMutable(); + + CGRect bounds = CGRectInset(cell.bounds,0,0); + + BOOL addLine =NO; + + if(indexPath.row==0&& indexPath.row== [tableView numberOfRowsInSection:indexPath.section]-1) { + + CGPathAddRoundedRect(pathRef,nil, bounds, cornerRadius, cornerRadius); + + }else if(indexPath.row==0) { + + CGPathMoveToPoint(pathRef,nil,CGRectGetMinX(bounds),CGRectGetMaxY(bounds)); + + CGPathAddArcToPoint(pathRef,nil,CGRectGetMinX(bounds),CGRectGetMinY(bounds),CGRectGetMidX(bounds),CGRectGetMinY(bounds), cornerRadius); + + CGPathAddArcToPoint(pathRef,nil,CGRectGetMaxX(bounds),CGRectGetMinY(bounds),CGRectGetMaxX(bounds),CGRectGetMidY(bounds), cornerRadius); + + CGPathAddLineToPoint(pathRef,nil,CGRectGetMaxX(bounds),CGRectGetMaxY(bounds)); + + addLine =YES; + + }else if(indexPath.row== [tableView numberOfRowsInSection:indexPath.section]-1) { + + CGPathMoveToPoint(pathRef,nil,CGRectGetMinX(bounds),CGRectGetMinY(bounds)); + + CGPathAddArcToPoint(pathRef,nil,CGRectGetMinX(bounds),CGRectGetMaxY(bounds),CGRectGetMidX(bounds),CGRectGetMaxY(bounds), cornerRadius); + + CGPathAddArcToPoint(pathRef,nil,CGRectGetMaxX(bounds),CGRectGetMaxY(bounds),CGRectGetMaxX(bounds),CGRectGetMidY(bounds), cornerRadius); + + CGPathAddLineToPoint(pathRef,nil,CGRectGetMaxX(bounds),CGRectGetMinY(bounds)); + + }else{ + + CGPathAddRect(pathRef,nil, bounds); + + addLine =YES; + + } + + layer.path= pathRef; + + CFRelease(pathRef); + + layer.fillColor= [UIColor colorWithWhite:1.f alpha:0.8f].CGColor; + + if(addLine ==YES) { + + CALayer* lineLayer = [[CALayer alloc]init]; + + CGFloat lineHeight = (1.f/ [UIScreen mainScreen].scale); + + lineLayer.frame=CGRectMake(CGRectGetMinX(bounds)+10, bounds.size.height-lineHeight, bounds.size.width-10, lineHeight); + + lineLayer.backgroundColor= tableView.separatorColor.CGColor; + + [layer addSublayer:lineLayer]; + + } + + UIView*testView = [[UIView alloc]initWithFrame:bounds]; + + [testView.layer insertSublayer:layer atIndex:0]; + + testView.backgroundColor=UIColor.clearColor; + + cell.backgroundView= testView; + + } + + } + +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDetailTableHeardView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDetailTableHeardView.h new file mode 100644 index 0000000..06d6e6d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDetailTableHeardView.h @@ -0,0 +1,22 @@ +// +// XJSOSDetailTableHeardView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import +#import "XJSOSDoctorDetailInfoModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSDetailTableHeardView : UIView + +@property (nonatomic, assign) CGFloat heradHeight; + +@property (nonatomic, strong) XJSOSDoctorDetailInfoModel * heardModel; +@property (nonatomic, strong) XJSOSDoctorDetailHistory * historyModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDetailTableHeardView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDetailTableHeardView.m new file mode 100644 index 0000000..907e1fd --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDetailTableHeardView.m @@ -0,0 +1,207 @@ +// +// XJSOSDetailTableHeardView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "XJSOSDetailTableHeardView.h" + + +@interface XJSOSDetailTableHeardView () + +@property (nonatomic, strong) UILabel * orderStatusLabel; +@property (nonatomic, strong) UILabel * sendLabel; +@property (nonatomic, strong) UILabel * helpLabel; +@property (nonatomic, strong) UILabel * orderNumberLabel; +@property (nonatomic, strong) UILabel * helpTimeLabel; +@property (nonatomic, strong) UILabel * sosTimeLabel; +@property (nonatomic, strong) UILabel * peopleLabel; +@property (nonatomic, strong) UILabel * orderTimeLabel; +@property (nonatomic, strong) UILabel * statusLabel; +@property (nonatomic, strong) UILabel * yewuLabel; +@property (nonatomic, strong) UILabel * hospitalLabel; +@property (nonatomic, strong) UILabel * zhuchangLabel; +@property (nonatomic, strong) UILabel * jiedanLabel; +@property (nonatomic, strong) UILabel * infoLabel; +@property (nonatomic, strong) UIView * lineView; +@property (nonatomic, strong) UIView * lineTwoView; + +@end + +@implementation XJSOSDetailTableHeardView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ +- (instancetype)initWithFrame:(CGRect)frame { + + if (self = [super initWithFrame:frame]) { + self.backgroundColor = KWhiteColor; + [self createUI]; + } + return self; +} + +- (void)createUI { + + + UILabel * titLabel= [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(14), kRealValue(24), 100, 14)]; + titLabel.text = @"工单信息"; + titLabel.textAlignment = NSTextAlignmentLeft; + titLabel.font =BOLDSYSTEMFONT(14); + titLabel.textColor = UIColorHex(#333333); + [self addSubview:titLabel]; + NSArray * leftArray = @[@"工单状态",@"发起人",@"求助人",@"工单号",@"求助时间",@"就助时间"]; + UIView * linView; + for (int i = 0; i < leftArray.count; i ++) { + + UIView * infoView = [self orderInfoLabelViewWithFrame:CGRectMake(0, titLabel.bottom + kRealValue(10)+ kRealValue(27) * i, self.width, kRealValue(27)) withLeftText:leftArray[i] withRightLabTag:100 + i]; + [self addSubview:infoView]; + if (i == leftArray.count - 1) { + linView = [[UIView alloc] initWithFrame:CGRectMake(0, infoView.bottom + kRealValue(8), self.width, 1)]; + linView.backgroundColor = UIColorHex(#E0E0E0); + self.lineView = linView; + } + [self addSubview:linView]; + } + + UILabel * infoLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(14), linView.bottom + kRealValue(21), 100, 14)]; + infoLabel.text = @"派单信息"; + infoLabel.textAlignment = NSTextAlignmentLeft; + infoLabel.font =BOLDSYSTEMFONT(14); + infoLabel.textColor = UIColorHex(#333333); + self.infoLabel = infoLabel; + [self addSubview:infoLabel]; + + NSArray * leftInfoArray = @[@"操作人员",@"派单时间",@"当前状态",@"派单业务",@"派单医院",@"驻场人员",@"接单时间"]; + UIView * linTwoView; + for (int j = 0; j < leftInfoArray.count; j ++) { + + UIView * orderView = [self orderInfoLabelViewWithFrame:CGRectMake(0, infoLabel.bottom + kRealValue(10) + kRealValue(25) * j, self.width, kRealValue(25)) withLeftText:leftInfoArray[j] withRightLabTag:200 + j]; + orderView.tag = 500 + j; + [self addSubview:orderView]; + + if (j == leftInfoArray.count - 1) { + linTwoView = [[UIView alloc] initWithFrame:CGRectMake(0, orderView.bottom + kRealValue(8), self.width, 1)]; + linTwoView.backgroundColor = UIColorHex(#E0E0E0); + self.lineTwoView = linTwoView; + } + + [self addSubview:linTwoView]; + } + +} + + +- (UIView *)orderInfoLabelViewWithFrame:(CGRect)frame + withLeftText:(NSString *)leftText + withRightLabTag:(NSInteger)rightTag { + + UIView * labeView = [[UIView alloc] initWithFrame:frame]; + + UILabel * leftLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(14), 0, 80, kRealValue(25))]; + leftLabel.textColor = UIColorHex(#666666); + leftLabel.font = SYSTEMFONT(13); + leftLabel.textAlignment = NSTextAlignmentLeft; + leftLabel.text = leftText; + [labeView addSubview:leftLabel]; + + + UILabel * rightLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.width - 200 - kRealValue(14), 0, 200, kRealValue(25))]; + rightLabel.textColor = UIColorHex(#333333); + rightLabel.font = SYSTEMFONT(13); + rightLabel.textAlignment = NSTextAlignmentRight; + rightLabel.text = leftText; + rightLabel.tag = rightTag; + [labeView addSubview:rightLabel]; + + return labeView; + +} + +- (void)setHeardModel:(XJSOSDoctorDetailInfoModel *)heardModel { + + _heardModel = heardModel; + + self.statusLabel = [self viewWithTag:100]; + self.statusLabel.text = _heardModel.orderStatus_dictText; + + self.sendLabel = [self viewWithTag:101]; + self.sendLabel.text = _heardModel.initiatorUserName; + + self.helpLabel = [self viewWithTag:102]; + self.helpLabel.text = _heardModel.salvageUserName; + + self.orderNumberLabel = [self viewWithTag:103]; + self.orderNumberLabel.text = _heardModel.detail_id; + + self.helpTimeLabel = [self viewWithTag:104]; + self.helpTimeLabel.text = _heardModel.createTime; + + self.sosTimeLabel = [self viewWithTag:105]; + self.sosTimeLabel.text = _heardModel.majorResponseTime; +// + + self.peopleLabel = [self viewWithTag:200]; + self.peopleLabel.text = _heardModel.operationUserName; + + +} + +- (void)setHistoryModel:(XJSOSDoctorDetailHistory *)historyModel { + + _historyModel = historyModel; + + UIView * oneView = [self viewWithTag:500]; + UIView * twoView = [self viewWithTag:501]; + UIView * threeView = [self viewWithTag:502]; + UIView * fourView = [self viewWithTag:503]; + UIView * fiveView = [self viewWithTag:504]; + UIView * sixView = [self viewWithTag:505]; + UIView * sevView = [self viewWithTag:506]; + + self.orderTimeLabel = [self viewWithTag:201]; + self.statusLabel = [self viewWithTag:202]; + self.yewuLabel = [self viewWithTag:203]; + self.hospitalLabel = [self viewWithTag:204]; + self.zhuchangLabel = [self viewWithTag:205]; + self.jiedanLabel = [self viewWithTag:206]; + + + + if (_historyModel) { + self.orderTimeLabel.text = _historyModel.createTime; + self.statusLabel.text = _historyModel.accept_dictText; + self.yewuLabel.text = _historyModel.stationBusiness_dictText; + self.hospitalLabel.text = _historyModel.sendOrderHospital; + self.zhuchangLabel.text = _historyModel.stationUserName; + self.jiedanLabel.text = _historyModel.transferOrderTime; + self.lineTwoView.hidden = false; + self.heradHeight = sevView.bottom; + }else + { + [oneView removeFromSuperview]; + [twoView removeFromSuperview]; + [threeView removeFromSuperview]; + [fourView removeFromSuperview]; + [fiveView removeFromSuperview]; + [sixView removeFromSuperview]; + [sevView removeFromSuperview]; + + self.infoLabel.hidden = true; + self.orderTimeLabel.hidden = true; + self.statusLabel.hidden = true; + self.yewuLabel.hidden = true; + self.hospitalLabel.hidden = true; + self.zhuchangLabel.hidden = true; + self.lineTwoView.hidden = true; + self.heradHeight = self.lineView.bottom; + } + +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorDetailTable.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorDetailTable.h new file mode 100644 index 0000000..87d740d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorDetailTable.h @@ -0,0 +1,18 @@ +// +// XJSOSDoctorDetailTable.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/23. +// + +#import +#import "XJSOSDoctorDetailInfoModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSDoctorDetailTable : UITableView + +@property (nonatomic, strong) XJSOSDoctorDetailInfoModel * model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorDetailTable.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorDetailTable.m new file mode 100644 index 0000000..95ab802 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorDetailTable.m @@ -0,0 +1,181 @@ +// +// XJSOSDoctorDetailTable.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/23. +// + +#import "XJSOSDoctorDetailTable.h" +#import "XJSOSDetailTableHeardView.h" +#import "XJHistoryOrderTableViewCell.h" + +@interface XJSOSDoctorDetailTable () + +@property (nonatomic, strong) XJSOSDetailTableHeardView * heardView; + +@end + + +@implementation XJSOSDoctorDetailTable + +- (XJSOSDetailTableHeardView *)heardView { + + if (!_heardView) { + + _heardView = [[XJSOSDetailTableHeardView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth - kRealValue(22), 190)]; + + _heardView.backgroundColor = KClearColor; + + } + return _heardView; +} + +- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style { + + if (self = [super initWithFrame:frame style:style]) { + + [self createUI]; + } + + return self; +} + +- (void)createUI { + + if (@available(iOS 11.0, *)) { + self.estimatedRowHeight = 0; + self.estimatedSectionFooterHeight = 0; + self.estimatedSectionHeaderHeight = 0; + self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.delegate = self; + self.dataSource = self; + self.backgroundColor = UIColor.clearColor; + self.showsVerticalScrollIndicator = false; + self.showsHorizontalScrollIndicator = false; + self.separatorStyle = UITableViewCellSeparatorStyleNone; + self.estimatedRowHeight = 60; + self.rowHeight = UITableViewAutomaticDimension; + self.tableHeaderView = self.heardView; + self.tableHeaderView.height = self.heardView.heradHeight; + +} + + +- (void)setModel:(XJSOSDoctorDetailInfoModel *)model { + + _model = model; + if (_model.orderSendRecordList.count >= 1) { + + self.heardView.historyModel = self.model.orderSendRecordList[0]; + }else + { + self.heardView.historyModel = nil; + } + self.heardView.heardModel = self.model; + self.heardView.height = self.heardView.heradHeight; + [self reloadData]; + +} +#pragma mark - tableview的代理方法 +//组数 +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + if (_model.orderSendRecordList.count >= 1) { + + return 1; + }else + { + return 0; + } +} +//每组多少行 +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + if (_model.orderSendRecordList.count >= 1) { + + return self.model.orderSendRecordList.count - 1; + }else + { + return 0; + } + +} +//注册cell +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + NSMutableArray * dataArray = [[NSMutableArray alloc] initWithArray:self.model.orderSendRecordList]; + [dataArray removeFirstObject]; + + XJSOSDoctorDetailHistory * hisModel = dataArray[indexPath.row]; + XJHistoryOrderTableViewCell * cell = [self dequeueReusableCellWithIdentifier:@"STATUSCELL"]; + if (!cell) { + + cell = [[XJHistoryOrderTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"STATUSCELL"]; + } + cell.historyModel= hisModel; + cell.backgroundColor = KWhiteColor; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + return cell; + + + +} +//每行高度 +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return kRealValue(180); +} + +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + + return kRealValue(46); +} + +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { + + return CGFLOAT_MIN; +} + +//组头 --- 组尾 + +- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { + + + return [UIView new]; + +} + + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + + if (_model.orderSendRecordList.count >= 2) { + + + + UIView * heardView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(46))]; + heardView.backgroundColor = KWhiteColor; + UILabel * historyLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(14), kRealValue(23), 100, 14)]; + historyLabel.text = @"历史派单"; + historyLabel.textAlignment = NSTextAlignmentLeft; + historyLabel.font =BOLDSYSTEMFONT(14); + historyLabel.textColor = UIColorHex(#333333); + [heardView addSubview:historyLabel]; + return heardView; + } + return UIView.new; + + +} +////cell点击事件 +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + +} + + +@end + + + diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableView.h new file mode 100644 index 0000000..49f09c3 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableView.h @@ -0,0 +1,21 @@ +// +// XJSOSDoctorTableView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +typedef void(^sosDoctorListActionBlock)(NSString * sessionId , NSString * hospitalId); + +@interface XJSOSDoctorTableView : UITableView + +@property (nonatomic, strong) NSArray * dataArray; + +@property (nonatomic, copy) sosDoctorListActionBlock recordBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableView.m new file mode 100644 index 0000000..efe4664 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableView.m @@ -0,0 +1,137 @@ +// +// XJSOSDoctorTableView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "XJSOSDoctorTableView.h" +#import "XJSOSDoctorTableViewCell.h" + +@interface XJSOSDoctorTableView () + + +@end + + +@implementation XJSOSDoctorTableView + + +- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style { + + if (self = [super initWithFrame:frame style:style]) { + + [self createUI]; + } + + return self; +} + +- (void)createUI { + + if (@available(iOS 11.0, *)) { + self.estimatedRowHeight = 0; + self.estimatedSectionFooterHeight = 0; + self.estimatedSectionHeaderHeight = 0; + self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.delegate = self; + self.dataSource = self; + self.backgroundColor = UIColor.clearColor; + self.showsVerticalScrollIndicator = false; + self.showsHorizontalScrollIndicator = false; + self.separatorStyle = UITableViewCellSeparatorStyleNone; + self.estimatedRowHeight = 60; + self.rowHeight = UITableViewAutomaticDimension; + +} + + +- (void)setDataArray:(NSArray *)dataArray { + + _dataArray = dataArray; + + [self reloadData]; +} + +#pragma mark - tableview的代理方法 +//组数 +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return self.dataArray.count; +} +//每组多少行 +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 1; +} +//注册cell +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + + XJSOSDoctorTableViewCell * cell = [self dequeueReusableCellWithIdentifier:@"STATUSCELL"]; + if (!cell) { + + cell = [[XJSOSDoctorTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"STATUSCELL"]; + } + cell.model= self.dataArray[indexPath.section]; + cell.backgroundColor = KWhiteColor; + cell.layer.cornerRadius = 10; + cell.layer.masksToBounds = YES; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + return cell; + + + +} +//每行高度 +//- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +//{ +// return kRealValue(77); +//} + +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + + return kRealValue(10); +} + +- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { + + return CGFLOAT_MIN; +} + +//组头 --- 组尾 + +- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { + + + return [UIView new]; + +} + + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + + + UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(10))]; + + + return footerView; + +} +////cell点击事件 +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + XJSOSDoctorRecordListModel * model= self.dataArray[indexPath.section]; + + if (self.recordBlock) { + self.recordBlock(model.sos_id,model.sos_id); + } +} + + +@end + + + diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.h new file mode 100644 index 0000000..abde276 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.h @@ -0,0 +1,18 @@ +// +// XJSOSDoctorTableViewCell.h +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import +#import "XJSOSDoctorModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSDoctorTableViewCell : UITableViewCell + +@property (nonatomic, strong) XJSOSDoctorRecordListModel * model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m new file mode 100644 index 0000000..43bdf1e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m @@ -0,0 +1,149 @@ +// +// XJSOSDoctorTableViewCell.m +// EscortProject +// +// Created by 仁康信息 on 2023/8/22. +// + +#import "XJSOSDoctorTableViewCell.h" + +@interface XJSOSDoctorTableViewCell () + +@property (nonatomic, strong) UILabel * nameLabel; + +@property (nonatomic, strong) UILabel * timeLabel; + +@property (nonatomic, strong) YYLabel * lookDetail; + +@property (nonatomic, strong) UILabel * statusLabel; + +@property (nonatomic, strong) UILabel * hospitalLabel; + + + +@end + + +@implementation XJSOSDoctorTableViewCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + + [self createUI]; + } + return self; +} + +- (void)createUI { + + self.nameLabel = [[UILabel alloc] init]; + self.nameLabel.textColor = CFontColor1; + self.nameLabel.font = BOLDSYSTEMFONT(14); + self.nameLabel.textAlignment = NSTextAlignmentLeft; + self.nameLabel.text = @"求助人：张三"; + [self.contentView addSubview:self.nameLabel]; + + [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(15); + make.top.mas_offset(16); + make.height.mas_offset(14); + }]; + [self.nameLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + + + self.timeLabel = [[UILabel alloc] init]; + self.timeLabel.textColor = UIColorHex(#333333); + self.timeLabel.font = MEDIUMFONT(14); + self.timeLabel.text = @"求救时间：202-01-01 13:12"; + self.timeLabel.textAlignment = NSTextAlignmentLeft; + [self.contentView addSubview:self.timeLabel]; + + [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(15); + make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(14); + make.height.mas_offset(14); + }]; + [self.timeLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + + self.hospitalLabel = [[UILabel alloc] init]; + self.hospitalLabel.textColor = UIColorHex(#333333); + self.hospitalLabel.font = MEDIUMFONT(14); + self.hospitalLabel.textAlignment = NSTextAlignmentLeft; + self.hospitalLabel.text = @"应急医院：西京医院-协助检查"; + [self.contentView addSubview:self.hospitalLabel]; + + [self.hospitalLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(15); + make.top.mas_equalTo(self.timeLabel.mas_bottom).offset(14); + make.height.mas_offset(13); + make.bottom.mas_offset(-18); + }]; + [self.hospitalLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + + UIImageView * accowImg = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"garyRight"]]; + [self.contentView addSubview:accowImg]; + + + [accowImg mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_offset(-15); + make.top.mas_offset(16); + make.height.mas_offset(14); + make.width.mas_offset(8); + }]; + + self.lookDetail = [[YYLabel alloc] init]; + self.lookDetail.textColor = UIColorHex(#999999); + self.lookDetail.font = MEDIUMFONT(13); + self.lookDetail.text = @"查看详情"; + self.lookDetail.textAlignment = NSTextAlignmentRight; + [self.contentView addSubview:self.lookDetail]; + + [self.lookDetail mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(accowImg.mas_left).offset(-6); + make.top.mas_offset(16); + make.height.mas_offset(14); + make.width.mas_offset(100); + }]; + + self.statusLabel = [[UILabel alloc] init]; + self.statusLabel.textColor = UIColorHex(#16C716); + self.statusLabel.font = MEDIUMFONT(14); + self.statusLabel.text = @"已完成"; + self.statusLabel.textAlignment = NSTextAlignmentRight; + [self.contentView addSubview:self.statusLabel]; + + [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_offset(-15); + make.top.mas_equalTo(self.lookDetail.mas_bottom).offset(26); + make.height.mas_offset(13); + }]; + + +} + +- (void)setModel:(XJSOSDoctorRecordListModel *)model { + _model = model; + self.nameLabel.text = [NSString stringWithFormat:@"求助人:%@",_model.initiatorUserName]; + self.timeLabel.text = [NSString stringWithFormat:@"求救时间:%@",_model.createTime]; + if ( ValidStr(_model.sendOrderHospital) ) { + self.hospitalLabel.text = @"应急医院:"; + }else + { + self.hospitalLabel.text =[NSString stringWithFormat:@"应急医院:%@-%@",_model.sendOrderHospital,_model.stationBusiness_dictText]; + } + self.statusLabel.text = model.orderStatus_dictText; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSliderView.h b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSliderView.h new file mode 100644 index 0000000..f904f63 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSliderView.h @@ -0,0 +1,21 @@ +// +// XJSliderView.h +// WDYAdjustFontSize +// +// Created by wdyzmx on 2022/1/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +typedef void (^SliderValueCallBack)(UISlider *); + +@interface XJSliderView : UIView +/// 初始化方法 +/// @param frame frame +/// @param callBack 回调block +- (instancetype)initWithFrame:(CGRect)frame callBack:(SliderValueCallBack)callBack; +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSliderView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSliderView.m new file mode 100644 index 0000000..366718f --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSliderView.m @@ -0,0 +1,157 @@ +// +// XJSliderView.m +// WDYAdjustFontSize +// +// Created by wdyzmx on 2022/1/19. +// + +#import "XJSliderView.h" + +#define kScreenWidth UIScreen.mainScreen.bounds.size.width +#define kScreenHeight UIScreen.mainScreen.bounds.size.height +#define SliderRate 1.0 +#define DefaultFontSize 16 +#define SliderHeight 10 +#define SliderBGWidth 300 +#define SliderWidth 330 + +@interface XJSliderView () +/// slider +@property (nonatomic, strong) UISlider *slider; +/// tap手势 +@property (nonatomic, strong) UITapGestureRecognizer *tapGesture; +/// slider控件value回调 +@property (nonatomic, copy) SliderValueCallBack callBack; +/// @{@"字体size": @"slider value"} 字体size对应slider value +@property (nonatomic, strong) NSDictionary *unitDict; +@property (nonatomic, strong) NSArray *unitArr; +@end + +@implementation XJSliderView + +#pragma mark - initWithFrame +- (instancetype)initWithFrame:(CGRect)frame callBack:(SliderValueCallBack)callBack { + self = [super initWithFrame:frame]; + if (self) { + self.callBack = callBack; + + UIImageView *sliderBgImgView = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"icon_detail_sliderBgImg"]]; + [self addSubview:sliderBgImgView]; + sliderBgImgView.frame = CGRectMake(frame.size.width / 2 - SliderBGWidth / 2, 5, SliderBGWidth, SliderHeight); + + self.slider = [[UISlider alloc] init]; + self.slider.minimumValue = 1; + self.slider.maximumValue = 4; + self.slider.minimumTrackTintColor = [UIColor clearColor]; + self.slider.maximumTrackTintColor = [UIColor clearColor]; + self.slider.multipleTouchEnabled = NO; + [self.slider setThumbImage:[UIImage imageNamed:@"icon_detail_slider_thum"] forState:UIControlStateNormal]; + [self addSubview:self.slider]; + self.slider.frame = CGRectMake(0, 0, SliderWidth, SliderHeight); + self.slider.center = sliderBgImgView.center; + [self.slider addTarget:self + action:@selector(valueChanged:) + forControlEvents:UIControlEventValueChanged]; + [self.slider addTarget:self + action:@selector(sliderTouchDown:) + forControlEvents:UIControlEventTouchDown]; + [self.slider addTarget:self + action:@selector(sliderTouchUp:) + forControlEvents:UIControlEventTouchUpInside]; + // 字体size值为该字典key slider value值为该字典value + self.unitDict = @{ + @"16": @"1", + @"18": @"2", + @"20": @"3", + @"22": @"4" + }; + + self.unitArr = @[ + @"16", + @"18", + @"20", + @"22" + ]; + + [self.slider setValue:[self sliderInitialValue]]; + + for (int i = 0; i < self.unitArr.count; i++) { + CGFloat ptx = (kScreenWidth - SliderBGWidth) / 2 + (SliderBGWidth / 3) * i; + UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 50, 20)]; + label.center = CGPointMake(ptx, self.slider.center.y + 25); + label.font = [UIFont systemFontOfSize:14]; + label.textAlignment = NSTextAlignmentCenter; + label.text = self.unitArr[i]; +// label.backgroundColor = UIColor.redColor; + [self addSubview:label]; + } +// self.backgroundColor = UIColor.orangeColor; + self.tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAction:)]; + [self addGestureRecognizer:self.tapGesture]; + } + return self; +} + +- (CGFloat)sliderInitialValue { + NSMutableDictionary *mdict = [NSMutableDictionary dictionaryWithDictionary:[[NSUserDefaults standardUserDefaults] objectForKey:@"fontSizeDict"]]; + __block NSString *value = nil; + if (mdict) { + [mdict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, NSString * _Nonnull obj, BOOL * _Nonnull stop) { + if ([obj isEqualToString:@"1"]) { + value = self.unitDict[key]; + } + }]; + } + return value ? value.floatValue : 1; +} + +#pragma mark - 滑动slider修改 +- (void)valueChanged:(UISlider *)sender { + // 只取整数值，固定间距 + NSString *tempStr = [self numberFormat:sender.value]; + if (tempStr.floatValue == sender.value) { + return; + } + [sender setValue:tempStr.integerValue]; + // 调用block + self.callBack(self.slider); +} + +#pragma mark - Slider Action +- (void)sliderTouchDown:(UISlider *)sender { + self.tapGesture.enabled = NO; +} + +- (void)sliderTouchUp:(UISlider *)sender { + self.tapGesture.enabled = YES; +} + +#pragma mark - 手势点击事件 +- (void)tapAction:(UITapGestureRecognizer *)tap { + CGPoint point = [tap locationInView:self]; + CGFloat margin = kScreenWidth / 2 - SliderBGWidth / 2; + CGFloat unitWidth = SliderWidth / 3; + CGFloat res = (point.x - margin) / unitWidth; + [self.slider setValue:[self numberFormat:res].floatValue + 1]; + // 调用block + self.callBack(self.slider); +// CGFloat rate = res - [self numberFormat:res].floatValue; +} + +#pragma mark - numberFormat +- (NSString *)numberFormat:(float)num { + NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; + [formatter setPositiveFormat:@"0"]; + return [formatter stringFromNumber:[NSNumber numberWithFloat:num]]; +} + + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h new file mode 100644 index 0000000..f6f716a --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h @@ -0,0 +1,16 @@ +// +// MonitoringDetailViewController.h +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import "BaseWebViewVC.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringDetailViewController : BaseWebViewVC + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m new file mode 100644 index 0000000..8de5af1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m @@ -0,0 +1,146 @@ +// +// MonitoringDetailViewController.m +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import "MonitoringDetailViewController.h" + +@interface MonitoringDetailViewController () + +@end + +@implementation MonitoringDetailViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.view.backgroundColor = CViewBgColor; + self.isHidenNaviBar = false; + self.navigationItem.title = @"详情"; + [self addNavigationItemWithImageNames:@[@"whiteBack_icon"] isLeft:YES target:self action:@selector(backOnclick) tags:@[@"1"]]; + +} +- (void)backOnclick { + + [self.navigationController popViewControllerAnimated:YES]; +} + +- (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation{ + [self hiddenAllMBProgressHUD]; + self.navigationItem.title = @"详情";; + +} + + +-(void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated]; + + if (@available(iOS 15.0, *)) { + UINavigationBarAppearance *appearance = [UINavigationBarAppearance new]; + [appearance configureWithDefaultBackground]; + appearance.shadowColor = nil; + appearance.backgroundEffect = nil; + appearance.backgroundColor = UIColorHex(#21BEBD); + self.navigationController.navigationBar.backgroundColor = UIColorHex(#21BEBD);; + self.navigationController.navigationBar.barTintColor = KWhiteColor; + self.navigationController.navigationBar.shadowImage = [UIImage new]; + appearance.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; // 设置标题颜色 +// appearance.tintColor = [UIColor whiteColor]; // 设置按钮颜色为白色 + self.navigationController.navigationBar.standardAppearance = appearance; + /** + * iOS15 新增特性：滑动边界样式 + * New feature in iOS15: sliding border style + */ + self.navigationController.navigationBar.scrollEdgeAppearance = appearance; + + } else { + self.navigationController.navigationBar.backgroundColor =UIColorHex(#21BEBD); + self.navigationController.navigationBar.barTintColor = UIColorHex(#21BEBD); + self.navigationController.navigationBar.shadowImage = [UIImage new]; + NSDictionary *titleAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; + [self.navigationController.navigationBar setTitleTextAttributes:titleAttributes]; + } + + +} + + +- (void)viewWillDisappear:(BOOL)animated { + + [super viewWillDisappear:animated]; + //自定义navBar，根据当前的nav自定义 navBar + + if (@available(iOS 15.0, *)) { + UINavigationBarAppearance *appearance = [UINavigationBarAppearance new]; + [appearance configureWithDefaultBackground]; + appearance.shadowColor = nil; + appearance.backgroundEffect = nil; + appearance.backgroundColor = UIColorHex(#21BEBD); + self.navigationController.navigationBar.backgroundColor = UIColorHex(#21BEBD);; + self.navigationController.navigationBar.barTintColor = KWhiteColor; + self.navigationController.navigationBar.shadowImage = [UIImage new]; + appearance.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; // 设置标题颜色 +// appearance.tintColor = [UIColor whiteColor]; // 设置按钮颜色为白色 + self.navigationController.navigationBar.standardAppearance = appearance; + /** + * iOS15 新增特性：滑动边界样式 + * New feature in iOS15: sliding border style + */ + self.navigationController.navigationBar.scrollEdgeAppearance = appearance; + + } else { + self.navigationController.navigationBar.backgroundColor =UIColorHex(#21BEBD); + self.navigationController.navigationBar.barTintColor =KWhiteColor; + self.navigationController.navigationBar.shadowImage = [UIImage new]; + NSDictionary *titleAttributes = @{NSForegroundColorAttributeName : [UIColor whiteColor]}; + [self.navigationController.navigationBar setTitleTextAttributes:titleAttributes]; + } + + UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[HQBaseNavigationController class]]]; + //设置导航条字体颜色和大小 +// self.navigationController.navigationBar + NSDictionary *dict = [NSDictionary dictionary]; + if (@available(iOS 13.0, *)) { + // iOS 13 之后，这样设置导航条的相关属性才正确。之前的做法已失效 + dict = @{NSForegroundColorAttributeName: [UIColor tertiarySystemBackgroundColor], NSFontAttributeName: [UIFont systemFontOfSize:18]}; + UINavigationBarAppearance *navBarAppearance = [[UINavigationBarAppearance alloc]init]; + [navBarAppearance configureWithOpaqueBackground]; //Opaque: 不透明 + navBarAppearance.backgroundColor = UIColorHex(#21BEBD); + [navBarAppearance setTitleTextAttributes: dict]; + navBar.standardAppearance = navBarAppearance; + navBar.scrollEdgeAppearance = navBarAppearance; + [navBarAppearance configureWithOpaqueBackground];// 重置背景和阴影颜色 + navBarAppearance.backgroundColor = UIColorHex(#21BEBD); + navBarAppearance.backgroundEffect = nil; + // 去除导航栏阴影（如果不设置clear，导航栏底下会有一条阴影线） + navBarAppearance.shadowColor = [UIColor clearColor]; + } else { + dict = @{NSForegroundColorAttributeName: KWhiteColor, NSFontAttributeName: [UIFont systemFontOfSize:18]}; + //设置导航条背景色 + navBar.barTintColor = KWhiteColor; + [navBar setTitleTextAttributes:dict]; + } + //设置导航条不透明 + navBar.translucent = NO; + //设置除导航条以外的其他字体颜色 + [navBar setTintColor:UIColorHex(#21BEBD)]; + [navBar setBackgroundImage:[UIImage imageWithColor:UIColorHex(#21BEBD)] forBarMetrics:UIBarMetricsDefault]; + [navBar setShadowImage:[UIImage new]]; + //自定义navBar，根据当前的nav自定义 navBar + +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h new file mode 100644 index 0000000..eb2781c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.h @@ -0,0 +1,18 @@ +// +// MonitoringHistoryController.h +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringHistoryController : HQBaseViewController + +@property (nonatomic, strong) NSString * eventType; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m new file mode 100644 index 0000000..f3562fb --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m @@ -0,0 +1,279 @@ +// +// MonitoringHistoryController.m +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import "MonitoringHistoryController.h" +#import "MonitoringHistoryTableView.h" +#import "MonitoringDataModel.h" + +@interface MonitoringHistoryController () + +@property (nonatomic, strong) UILabel *weekLabel; +@property (nonatomic, strong) NSDate *currentDate; // 当前日期 +@property (nonatomic, strong) UIButton * nextBtn; +@property (nonatomic, assign) NSInteger pageNo; +@property (nonatomic, strong) MonitoringHistoryTableView * tableView; + +@property (nonatomic, strong) NSMutableArray * dataArray; + + + +@end + +@implementation MonitoringHistoryController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + _dataArray = [[NSMutableArray alloc] init]; + } + return _dataArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +// [self createUI]; + self.pageNo = 1; + self.isHidenNaviBar = false; + self.currentDate = [NSDate date]; + [self addNavigationItemWithImageNames:@[@"whiteBack_icon"] isLeft:YES target:self action:@selector(popUpVC) tags:@[@"1"]]; + self.view.backgroundColor = UIColorHex(#F5F7FB); + self.navigationItem.title = @"预警历史"; + UIView * topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 84)]; + topView.backgroundColor = KClearColor; + [self.view addSubview:topView]; + + UIButton * preBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 20, kRealValue(97), 40)]; + [preBtn setTitle:@"前一月" forState:UIControlStateNormal]; + [preBtn setImage:[UIImage imageNamed:@"blackLeftAccow"] forState:UIControlStateNormal]; + [preBtn setTitleColor:UIColorHex(#252535) forState:UIControlStateNormal]; + preBtn.titleLabel.font = MEDIUMFONT(14); + [preBtn addTarget:self action:@selector(previousMonthAction) forControlEvents:UIControlEventTouchUpInside]; + + // 设置标题的位置（标题右移） + preBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0); + + // 设置图像的位置（图像左移） + preBtn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 10); + [topView addSubview:preBtn]; + + + UILabel * centeLabel = [[UILabel alloc] initWithFrame:CGRectMake(preBtn.right, 20, kScreenWidth - kRealValue(194), 40)]; + centeLabel.layer.cornerRadius = 20; + centeLabel.layer.masksToBounds = true; + centeLabel.backgroundColor = UIColorHex(#EAECF1); + centeLabel.textAlignment = NSTextAlignmentCenter; + centeLabel.font = BOLDSYSTEMFONT(13); +// centeLabel.text = [self getWeekRangeForDateString:self.currentTime]; + self.weekLabel = centeLabel; + [topView addSubview:centeLabel]; + + + UIButton * nextBtn = [[UIButton alloc] initWithFrame:CGRectMake(centeLabel.right, 20, kRealValue(97), 40)]; + [nextBtn setTitle:@"下一月" forState:UIControlStateNormal]; + [nextBtn setImage:[UIImage imageNamed:@"blackRightAccow"] forState:UIControlStateNormal]; + [nextBtn setTitleColor:UIColorHex(#252535) forState:UIControlStateNormal]; + nextBtn.titleLabel.font = MEDIUMFONT(14); + [nextBtn DIYStyle:DIYStyleImgRight padding:10]; + [nextBtn addTarget:self action:@selector(nextWeekAction) forControlEvents:UIControlEventTouchUpInside]; + self.nextBtn = nextBtn; + [topView addSubview:nextBtn]; + // 更新显示的日期范围 + [self updateMonthLabel]; + + self.tableView = [[MonitoringHistoryTableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [self.view addSubview:self.tableView]; + + [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.mas_offset(0); + make.top.mas_offset(94); + }]; + MJWeakSelf + self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + [weakSelf updateHistoryData:self.currentDate]; + }]; + + self.tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf updateHistoryData:self.currentDate]; + }]; + + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + //元素竖直方向的间距 + emptyView.subViewMargin = 20.f; + //标题颜色 + emptyView.titleLabTextColor = [UIColor blackColor]; + //描述字体 + emptyView.detailLabFont = [UIFont systemFontOfSize:17]; + //按钮背景色 + emptyView.actionBtnBackGroundColor = KWhiteColor; + emptyView.actionBtnWidth = CGFLOAT_MIN; + emptyView.actionBtnHeight = CGFLOAT_MIN; + + //设置空内容占位图 + self.tableView.ly_emptyView = emptyView; + +} + +- (void)popUpVC { + + [self.navigationController popViewControllerAnimated:YES]; +} + +// 更新显示月份的标签 +- (void)updateMonthLabel { + NSString *currentMonth = [self getMonthFromDate:self.currentDate]; + self.weekLabel.text = currentMonth; // 设置标签显示当前月份 + [self updateHistoryData:currentMonth]; +} + +// 根据传入的日期获取当前的月份 (yyyy-MM 格式) +- (NSString *)getMonthFromDate:(NSDate *)date { + NSCalendar *calendar = [NSCalendar currentCalendar]; + NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth fromDate:date]; + + // 格式化输出为 yyyy-MM 格式 + NSString *month = [NSString stringWithFormat:@"%04ld-%02ld", (long)components.year, (long)components.month]; + + return month; +} + +// 日期字符串转 NSDate +- (NSDate *)dateFromString:(NSString *)dateString { + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; + [formatter setDateFormat:@"yyyy-MM-dd"]; + return [formatter dateFromString:dateString]; +} + +// 获取传入日期的上一个月 +- (NSDate *)getPreviousMonthFromDate:(NSDate *)date { + NSCalendar *calendar = [NSCalendar currentCalendar]; + NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth fromDate:date]; + components.month -= 1; // 上一个月 + return [calendar dateFromComponents:components]; +} + +// 获取传入日期的下一个月 +- (NSDate *)getNextMonthFromDate:(NSDate *)date { + NSCalendar *calendar = [NSCalendar currentCalendar]; + NSDateComponents *components = [calendar components:NSCalendarUnitYear | NSCalendarUnitMonth fromDate:date]; + components.month += 1; // 下一个月 + return [calendar dateFromComponents:components]; +} + +// 上个月按钮点击事件 +- (void)previousMonthAction { + // 获取上个月的日期 + self.currentDate = [self getPreviousMonthFromDate:self.currentDate]; + + // 更新显示标签 + [self updateMonthLabel]; + + // 更新按钮状态 + [self updateButtonStates]; +} + +// 下个月按钮点击事件 +- (void)nextWeekAction { + // 获取下个月的日期 + NSDate *nextMonthDate = [self getNextMonthFromDate:self.currentDate]; + + // 如果下个月大于当前日期，则禁止切换 + if ([nextMonthDate compare:[NSDate date]] == NSOrderedDescending) { + [EasyTextView showErrorText:@"暂无更多数据"]; + return; // 不允许切换到未来的月份 + } + + // 更新日期 + self.currentDate = nextMonthDate; + + // 更新显示标签 + [self updateMonthLabel]; + + // 更新按钮状态 + [self updateButtonStates]; +} + +// 更新按钮的状态 +- (void)updateButtonStates { + // 检查是否可以切换到下一个月 + NSDate *nextMonthDate = [self getNextMonthFromDate:self.currentDate]; + if ([nextMonthDate compare:[NSDate date]] == NSOrderedDescending) { + self.nextBtn.enabled = NO; // 禁用下个月按钮 + } else { + self.nextBtn.enabled = YES; // 启用下个月按钮 + } + +} + + +#pragma mark:接口请求 +- (void)updateHistoryData:(NSString *)date { + + [self showMBProgressHUDWithString:@"加载中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:User_ID forKey:@"userId"]; + [parmDic setObject:self.eventType forKey:@"eventType"]; + [parmDic setObject:[NSString stringWithFormat:@"%@-01",date] forKey:@"queryDate"]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@"20" forKey:@"pageSize"]; + + JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"HISTORYAPI" NeedToken:@""]; + [sosApi getWranHistoryList:parmDic]; + +} + +#pragma mark:网络请求 +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self.tableView.mj_header endRefreshing]; + [self.tableView.mj_footer endRefreshing]; + [EasyTextView showErrorText:message]; + [self hiddenAllMBProgressHUD]; + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"HISTORYAPI"]) + { + [self hiddenAllMBProgressHUD]; + [self.tableView.mj_header endRefreshing]; + [self.tableView.mj_footer endRefreshing]; + NSArray * array = response; + + for (NSDictionary * dic in array) { + + MonitoringDataModel * model = [MonitoringDataModel modelWithDictionary:dic]; + model.eventType = self.eventType; + [self.dataArray addObject:model]; + + } + self.tableView.dataArray = self.dataArray; + } + +} + + + + + + + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h new file mode 100644 index 0000000..e1ddfb2 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.h @@ -0,0 +1,16 @@ +// +// MonitoringWarchViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringWarchViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.h index cd37294..d938523 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.h +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.h @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MonitoringDataModel : NSObject +@interface MonitoringListDataModel : NSObject @property (nonatomic, copy) NSString * dataValue; @property (nonatomic, copy) NSString * wdTypeName; @@ -20,6 +20,27 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString * imageName; + + +@end + + +@interface MonitoringDataModel : NSObject + +@property (nonatomic, assign) NSInteger days; +@property (nonatomic, assign) CGFloat distance; +@property (nonatomic, assign) CGFloat aveSleep; + +@property (nonatomic, copy) NSString * watchNo; +@property (nonatomic, copy) NSString * warnTime; +@property (nonatomic, copy) NSString * dataValue; +@property (nonatomic, copy) NSString * address; +@property (nonatomic, copy) NSString * addressGd; +@property (nonatomic, copy) NSString * gpsErrorMsg; +@property (nonatomic, copy) NSString * eventType; + +@property (nonatomic, strong) NSArray * indexItemVos; + @end NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.m index df664fa..0e06f6e 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Model/MonitoringDataModel.m @@ -7,6 +7,20 @@ #import "MonitoringDataModel.h" +@implementation MonitoringListDataModel + +@end + + @implementation MonitoringDataModel + ++ (NSDictionary *)modelContainerPropertyGenericClass +{ + + return @{ + @"indexItemVos":[MonitoringListDataModel class], + + }; +} @end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadHeardView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadHeardView.h deleted file mode 100644 index 60af7cc..0000000 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadHeardView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// HeardBadHeardView.h -// EscortProject -// -// Created by 仁康信息 on 2023/12/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HeardBadHeardView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTabFooterView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTabFooterView.h deleted file mode 100644 index 77e0afd..0000000 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTabFooterView.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// HeardBadTabFooterView.h -// EscortProject -// -// Created by 仁康信息 on 2023/12/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HeardBadTabFooterView : UIView - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableView.h deleted file mode 100644 index 17175c1..0000000 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableView.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// HeardBadTableView.h -// EscortProject -// -// Created by 仁康信息 on 2023/12/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HeardBadTableView : UITableView - -@property (nonatomic, strong) NSArray * dataArray; - -@property (nonatomic, assign) BOOL isHaveQustion; - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableViewCell.h deleted file mode 100644 index 3e94c09..0000000 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableViewCell.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// HeardBadTableViewCell.h -// EscortProject -// -// Created by 仁康信息 on 2023/12/14. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface HeardBadTableViewCell : UITableViewCell - -@end - -NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableViewCell.m deleted file mode 100644 index 7b7b9e9..0000000 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableViewCell.m +++ /dev/null @@ -1,104 +0,0 @@ -// -// HeardBadTableViewCell.m -// EscortProject -// -// Created by 仁康信息 on 2023/12/14. -// - -#import "HeardBadTableViewCell.h" - -@interface HeardBadTableViewCell () - -@property (nonatomic, strong) UIImageView * projectImage; - -@property (nonatomic, strong) UILabel * projectName; - -@property (nonatomic, strong) UILabel * timeLabel; - -@property (nonatomic, strong) UILabel * dataLabel; - -@end - -@implementation HeardBadTableViewCell - -- (void)awakeFromNib { - [super awakeFromNib]; - // Initialization code -} - -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { - [super setSelected:selected animated:animated]; - - // Configure the view for the selected state -} - -- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { - - [self createUI]; - } - return self; -} - -- (void)createUI { - - UIView * backView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), 0, kScreenWidth - kRealValue(30), kRealValue(120))]; - backView.backgroundColor = KWhiteColor; - backView.layer.cornerRadius = 15.0; - backView.layer.masksToBounds = true; - [self addSubview:backView]; - - self.projectImage = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(12), kRealValue(22), kRealValue(32), kRealValue(32))]; - [backView addSubview:self.projectImage]; - - self.projectName = [[UILabel alloc] initWithFrame:CGRectMake(self.projectImage.right + kRealValue(12), kRealValue(20), backView.width - kRealValue(90), 15)]; - self.projectName.text = @"--"; - self.projectName.textColor = CFontColor1; - self.projectName.textAlignment = NSTextAlignmentLeft; - self.projectName.font = BOLDSYSTEMFONT(16); - [backView addSubview:self.projectName]; - - self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.projectImage.right + kRealValue(12),self.projectName.bottom + kRealValue(10), backView.width - kRealValue(90), 15)]; - self.timeLabel.text = @"--"; - self.timeLabel.textColor = CFontColor1; - self.timeLabel.textAlignment = NSTextAlignmentLeft; - self.timeLabel.font = BOLDSYSTEMFONT(16); - [backView addSubview:self.timeLabel]; - - UIButton * accowBtn = [[UIButton alloc] initWithFrame:CGRectMake(backView.width - kRealValue(12) - 20, kRealValue(23), 20, 20)]; - [accowBtn setImage:[UIImage imageNamed:@"garyRight"] forState:UIControlStateNormal]; - [backView addSubview:accowBtn]; - - self.dataLabel = [[UILabel alloc] initWithFrame:CGRectMake(accowBtn.left - kRealValue(12) - 200, kRealValue(26), 200, 22)]; - self.dataLabel.text = @"--"; - self.dataLabel.textColor = CFontColor1; - self.dataLabel.textAlignment = NSTextAlignmentRight; - self.dataLabel.font = BOLDSYSTEMFONT(16); - [backView addSubview:self.dataLabel]; - - UIView * lineView = [[UIView alloc] initWithFrame:CGRectMake(0, backView.bottom - kRealValue(44), backView.width, 1)]; - lineView.backgroundColor = UIColorHex(#EAECF1); - [backView addSubview:lineView]; - - UIButton * historyBtn = [[UIButton alloc] initWithFrame:CGRectMake(backView.width - kRealValue(82) ,backView.bottom - kRealValue(10) - kRealValue(24) , kRealValue(70), kRealValue(24))]; - [historyBtn setTitle:@"预警历史" forState:UIControlStateNormal]; - [historyBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; - historyBtn.layer.cornerRadius = 4.0; - historyBtn.layer.masksToBounds = true; - historyBtn.titleLabel.font = BOLDSYSTEMFONT(13); - historyBtn.backgroundColor = UIColorHex(#21BEBD); - [backView addSubview:historyBtn]; - - - UIButton * thresholdBtn = [[UIButton alloc] initWithFrame:CGRectMake(historyBtn.left - kRealValue(82) ,backView.bottom - kRealValue(10) - kRealValue(24) , kRealValue(70), kRealValue(24))]; - [thresholdBtn setTitle:@"阈值设置" forState:UIControlStateNormal]; - [thresholdBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; - thresholdBtn.layer.cornerRadius = 4.0; - thresholdBtn.layer.masksToBounds = true; - thresholdBtn.titleLabel.font = BOLDSYSTEMFONT(13); - thresholdBtn.backgroundColor = UIColorHex(#F1B101); - [backView addSubview:thresholdBtn]; -} - -@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableView.h new file mode 100644 index 0000000..e488435 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableView.h @@ -0,0 +1,18 @@ +// +// MonitoringHistoryTableView.h +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringHistoryTableView : UITableView + +@property (nonatomic, strong) NSArray * dataArray; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableView.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableView.m similarity index 50% rename from XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableView.m rename to XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableView.m index d2fa011..c89a5d2 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/HeardBadTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableView.m @@ -1,45 +1,25 @@ // -// HeardBadTableView.m -// EscortProject +// MonitoringHistoryTableView.m +// XinjiangProject // -// Created by 仁康信息 on 2023/12/14. +// Created by Apple on 2025/7/1. // -#import "HeardBadTableView.h" -#import "HeardBadHeardView.h" -#import "HeardBadTableViewCell.h" -#import "HeardBadTabFooterView.h" +#import "MonitoringHistoryTableView.h" +#import "MonitoringWatchTableView.h" +#import "MonitoringWarchTableHeardView.h" +#import "MonitoringWatchTableViewCell.h" +#import "MonitoringWatchTableFooterView.h" +#import "MonitoringHistoryTableViewCell.h" -@interface HeardBadTableView () - -@property (nonatomic, strong) HeardBadHeardView * badHeardView; - -@property (nonatomic, strong) HeardBadTabFooterView * badfooterView; +@interface MonitoringHistoryTableView () @end -@implementation HeardBadTableView +@implementation MonitoringHistoryTableView -- (HeardBadHeardView *)badHeardView { - - if (!_badHeardView) { - - _badHeardView = [[HeardBadHeardView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(195))]; - } - return _badHeardView; -} - -- (HeardBadTabFooterView *)badfooterView { - - if (!_badfooterView) { - - _badfooterView = [[HeardBadTabFooterView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(165))]; - } - return _badfooterView; - -} - (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style { @@ -64,19 +44,17 @@ self.dataSource = self; self.separatorStyle = UITableViewCellSeparatorStyleNone; self.showsVerticalScrollIndicator = NO; - self.tableHeaderView = self.badHeardView; - self.tableFooterView = self.badfooterView; + self.estimatedRowHeight = 60; + self.rowHeight = UITableViewAutomaticDimension; } -//- (void)setDataArray:(NSArray *)dataArray { -// -// _dataArray = dataArray; -// -// [self reloadData]; -// -//} -// - +- (void)setDataArray:(NSArray *)dataArray { + + _dataArray = dataArray; + + [self reloadData]; + +} #pragma mark - DataSource - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { @@ -86,20 +64,20 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 5; + return self.dataArray.count; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - HeardBadTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"CELLID"]; + MonitoringHistoryTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"CELLID"]; if (!cell) { - cell = [[HeardBadTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CELLID"]; + cell = [[MonitoringHistoryTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CELLID"]; } - cell.backgroundColor = CViewBgColor; - cell.selectionStyle = UITableViewCellSelectionStyleDefault; + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.model = self.dataArray[indexPath.section]; return cell; } @@ -108,6 +86,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + } - (CGFloat )tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section @@ -120,12 +99,6 @@ return kRealValue(15); } -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath -{ - - return kRealValue(120); -} - - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { @@ -133,4 +106,6 @@ } + + @end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableViewCell.h new file mode 100644 index 0000000..f152e67 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableViewCell.h @@ -0,0 +1,19 @@ +// +// MonitoringHistoryTableViewCell.h +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import +#import "MonitoringDataModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringHistoryTableViewCell : UITableViewCell + +@property (nonatomic, strong) MonitoringDataModel * model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableViewCell.m new file mode 100644 index 0000000..6c13915 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringHistoryTableViewCell.m @@ -0,0 +1,275 @@ +// +// MonitoringHistoryTableViewCell.m +// XinjiangProject +// +// Created by Apple on 2025/7/1. +// + +#import "MonitoringHistoryTableViewCell.h" + +@interface MonitoringHistoryTableViewCell () + +@property (nonatomic, strong) UIView * backView; +@property (nonatomic, strong) UIImageView * iconImage; +@property (nonatomic, strong) UILabel * typeNameLabel; +@property (nonatomic, strong) UILabel * warnLabel; + +@property (nonatomic, strong) UILabel * dataLabel; +@property (nonatomic, strong) UILabel * timeLabel; +@property (nonatomic, strong) UILabel * locationLabel; + +@end + +@implementation MonitoringHistoryTableViewCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + self.backgroundColor = CViewBgColor; + [self createUI]; + } + return self; +} + +- (void)createUI { + + self.backView = [[UIView alloc] init]; + self.backView.backgroundColor = KWhiteColor; + self.backView.layer.cornerRadius = 15.0; + self.backView.layer.masksToBounds = true; + [self.contentView addSubview:self.backView]; + + [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(10); + make.right.mas_offset(-10); + make.top.mas_offset(0); + }]; + + self.iconImage = [[UIImageView alloc] init]; + self.iconImage.layer.cornerRadius = 15.0; + self.iconImage.layer.masksToBounds = true; + [self.backView addSubview:self.iconImage]; + + [self.iconImage mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(12); + make.width.height.mas_offset(32); + make.top.mas_offset(21); + }]; + + self.typeNameLabel = [[UILabel alloc] init]; + self.typeNameLabel.textColor = UIColorHex(#252535); + self.typeNameLabel.font = BOLDSYSTEMFONT(16); + self.typeNameLabel.textAlignment = NSTextAlignmentLeft; + [self.backView addSubview:self.typeNameLabel]; + + [self.typeNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.iconImage.mas_right).offset(12); + make.top.mas_offset(21); + make.height.mas_offset(32); + }]; + + self.dataLabel = [[UILabel alloc] init]; + self.dataLabel.textColor = UIColorHex(#252535); + self.dataLabel.font = BOLDSYSTEMFONT(16); + self.dataLabel.textAlignment = NSTextAlignmentLeft; + self.dataLabel.text = @"--"; + [self.backView addSubview:self.dataLabel]; + + [self.dataLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_offset(20); + make.right.mas_offset(-15); + }]; + [self.dataLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + + self.warnLabel = [[UILabel alloc] init]; + self.warnLabel.textColor = UIColorHex(#F14D6B); + self.warnLabel.font = BOLDSYSTEMFONT(13); + self.warnLabel.textAlignment = NSTextAlignmentCenter; + self.warnLabel.text = @"预警值"; + self.warnLabel.layer.cornerRadius = 5; + self.warnLabel.layer.masksToBounds = true; + self.warnLabel.layer.borderWidth = 1.0; + self.warnLabel.layer.borderColor = UIColorHex(#F14D6B).CGColor; + [self.backView addSubview:self.warnLabel]; + + [self.warnLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(self.dataLabel.mas_left).offset(-15); + make.top.mas_offset(21); + make.height.mas_offset(24); + make.width.mas_offset(60); + }]; + + UIView * linView = [[UIView alloc] init]; + linView.backgroundColor = UIColorHex(#EAECF1); + [self.backView addSubview:linView]; + + [linView mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_offset(-15); + make.left.mas_offset(15); + make.top.mas_equalTo(self.iconImage.mas_bottom).offset(21); + make.height.mas_offset(1); + }]; + + self.timeLabel = [[UILabel alloc] init]; + self.timeLabel.textColor = UIColorHex(#77849E); + self.timeLabel.font = BOLDSYSTEMFONT(14); + self.timeLabel.textAlignment = NSTextAlignmentLeft; + self.timeLabel.text = @"预警时间:--"; + [self.backView addSubview:self.timeLabel]; + + [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(15); + make.right.mas_offset(-15); + make.top.mas_equalTo(linView.mas_bottom).offset(20); + }]; + + + self.locationLabel = [[UILabel alloc] init]; + self.locationLabel.textColor = UIColorHex(#77849E); + self.locationLabel.font = BOLDSYSTEMFONT(14); + self.locationLabel.textAlignment = NSTextAlignmentLeft; + self.locationLabel.text = @"预警地点:--"; + [self.backView addSubview:self.locationLabel]; + + [self.locationLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_offset(15); + make.right.mas_offset(-15); + make.top.mas_equalTo(self.timeLabel.mas_bottom).offset(20); + }]; + + [self.locationLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisVertical]; + + + [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { + + make.bottom.mas_equalTo(self.locationLabel.mas_bottom).offset(20); + }]; + + [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.mas_offset(0); + make.bottom.mas_equalTo(self.locationLabel.mas_bottom).offset(20); + + }]; + + +} + +- (void)setModel:(MonitoringDataModel *)model { + + _model = model; + + self.timeLabel.text = [NSString stringWithFormat:@"预警时间:%@",SafeStr(_model.warnTime) ]; + + NSString *address = nil; + if ([_model.address isKindOfClass:[NSString class]] && _model.address.length > 0) { + address = _model.address; + } else if ([_model.addressGd isKindOfClass:[NSString class]] && _model.addressGd.length > 0) { + address = _model.addressGd; + } else if ([_model.gpsErrorMsg isKindOfClass:[NSString class]] && _model.gpsErrorMsg.length > 0) { + address = _model.gpsErrorMsg; + } + self.locationLabel.text = [NSString stringWithFormat:@"预警地点:%@",address]; + + + + UIColor * color; + if ([_model.eventType isEqualToString:@"heart_rate"]) { + color = UIColorHex(#F14D6B); + self.iconImage.image = [UIImage imageNamed:@"homePageXinlv"]; + self.typeNameLabel.text = @"心率"; + NSString * dataString = [NSString stringWithFormat:@"%@次/分钟",SafeStr(_model.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + self.warnLabel.layer.borderColor = UIColorHex(#F14D6B).CGColor; + self.warnLabel.textColor = UIColorHex(#F14D6B); + + } + if ([_model.eventType isEqualToString:@"spo2"]) { + color = UIColorHex(#2AC79F); + self.iconImage.image = [UIImage imageNamed:@"homePageXueyang"]; + self.typeNameLabel.text = @"血氧饱和度"; + NSString * dataString = [NSString stringWithFormat:@"%@%%",SafeStr(_model.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + self.warnLabel.layer.borderColor = UIColorHex(#2AC79F).CGColor; + self.warnLabel.textColor = UIColorHex(#2AC79F); + + } + if ([_model.eventType isEqualToString:@"stress"]) { + color = UIColorHex(#1385FA); + self.iconImage.image = [UIImage imageNamed:@"homePageXinlv"]; + self.typeNameLabel.text = @"压力"; + NSString * dataString = [NSString stringWithFormat:@"%@",SafeStr(_model.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + self.warnLabel.layer.borderColor = color.CGColor; + self.warnLabel.textColor = color; + } + if ([_model.eventType isEqualToString:@"temperature"]) { + color = UIColorHex(#02C7D2); + self.iconImage.image = [UIImage imageNamed:@"homePageTiwen"]; + self.typeNameLabel.text = @"体温"; + NSString * dataString = [NSString stringWithFormat:@"%@℃",SafeStr(_model.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + self.warnLabel.layer.borderColor = color.CGColor; + self.warnLabel.textColor = color; + } + + + +} + + + + +/// 传入字符串和数字颜色，返回符合需求的富文本 +- (NSAttributedString *)attributedStringWithText:(NSString *)text numberColor:(UIColor *)numberColor { + if (text.length == 0) { + NSMutableAttributedString *emptyStr = [[NSMutableAttributedString alloc] initWithString:@""]; + [emptyStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:12], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, 0)]; + return emptyStr; + } + + // 替换单个 "-" 为 "--" + NSString *processedText = [text stringByReplacingOccurrencesOfString:@"-" withString:@"--"]; + + NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString:processedText]; + + // 默认样式 + [attributedStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:12], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, processedText.length)]; + + // 匹配数字或 "--" + NSError *error = nil; + NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"\\d+(\\.\\d+)?|--" + options:0 + error:&error]; + if (error) { + return attributedStr; + } + + NSArray *matches = [regex matchesInString:processedText options:0 range:NSMakeRange(0, processedText.length)]; + for (NSTextCheckingResult *match in matches) { + NSRange range = match.range; + [attributedStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:24 weight:UIFontWeightBold], + NSForegroundColorAttributeName: numberColor ?: [UIColor redColor] + } range:range]; + } + + return attributedStr; +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWarchTableHeardView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWarchTableHeardView.h new file mode 100644 index 0000000..54d85e6 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWarchTableHeardView.h @@ -0,0 +1,23 @@ +// +// MonitoringWarchTableHeardView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import +#import "MonitoringDataModel.h" + +NS_ASSUME_NONNULL_BEGIN +typedef void(^sleepAndStepDetailBlock)(NSString * type, NSString *time); + + +@interface MonitoringWarchTableHeardView : UIView + +@property (nonatomic, strong) MonitoringDataModel * heardModel; + +@property (nonatomic, copy) sleepAndStepDetailBlock heardBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWarchTableHeardView.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWarchTableHeardView.m new file mode 100644 index 0000000..e574128 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWarchTableHeardView.m @@ -0,0 +1,401 @@ +// +// MonitoringWarchTableHeardView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import "MonitoringWarchTableHeardView.h" + +@interface MonitoringWarchTableHeardView () + +@property (nonatomic, strong) UILabel * stepLabel; + +@property (nonatomic, strong) UILabel * timeLabel; + +@property (nonatomic, strong) UILabel * numberLabel; + +@property (nonatomic, strong) UILabel * allNumberLabel; + +@property (nonatomic, strong) UILabel * sleepTimeLabel; + +@property (nonatomic, strong) UILabel * subTimeLabel; + +@property (nonatomic, strong) UILabel * avgTimeLabel; + +@end + +@implementation MonitoringWarchTableHeardView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +- (instancetype)initWithFrame:(CGRect)frame { + + if (self = [super initWithFrame:frame]) { + + self.backgroundColor = CViewBgColor; + [self createUI]; + } + return self; +} + +- (void)createUI { + + UIImageView * StepView = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(15), kRealValue(15), ( kScreenWidth - kRealValue(45))/2, kRealValue(165))]; + StepView.layer.cornerRadius = 15.0; + StepView.layer.masksToBounds = YES; + StepView.image = [UIImage imageNamed:@"stepNumerIcon"]; + StepView.userInteractionEnabled = true; + StepView.backgroundColor = KWhiteColor; + StepView.userInteractionEnabled = true; + [self addSubview:StepView]; + + UITapGestureRecognizer *tapGesture=[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(clickAction)]; + [StepView addGestureRecognizer:tapGesture]; + + + UIImageView * stepImg = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(12), kRealValue(16), kRealValue(32), kRealValue(32))]; + stepImg.image = [UIImage imageNamed:@"stepNumberIcon"]; + [StepView addSubview:stepImg]; + + self.stepLabel = [[UILabel alloc] initWithFrame:CGRectMake(stepImg.right + kRealValue(12), kRealValue(14), StepView.width - kRealValue(46), 16)]; + self.stepLabel.text = @"步数"; + self.stepLabel.textColor = CFontColor1; + self.stepLabel.font = BOLDSYSTEMFONT(16); + self.stepLabel.textAlignment = NSTextAlignmentLeft; + [StepView addSubview:self.stepLabel]; + + self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(stepImg.right + kRealValue(12),self.stepLabel.bottom + kRealValue(9), StepView.width - kRealValue(46), 16)]; + self.timeLabel.text = @"--/--/--"; + self.timeLabel.textColor = UIColorHex(#77849E); + self.timeLabel.font = SYSTEMFONT(13); + self.timeLabel.textAlignment = NSTextAlignmentLeft; + [StepView addSubview:self.timeLabel]; + + UIButton * stepIconBtn = [[UIButton alloc] initWithFrame:CGRectMake(StepView.width - kRealValue(9) - 20, kRealValue(16), 20, 20)]; + [stepIconBtn setImage:[UIImage imageNamed:@"garyRight"] forState:UIControlStateNormal]; + [StepView addSubview:stepIconBtn]; + + UIImageView * stepBackImg =[[UIImageView alloc] initWithFrame:CGRectMake(0, stepImg.bottom + kRealValue(4), StepView.width, kRealValue(114))]; + stepBackImg.image = [UIImage imageNamed:@"steoBackImage"]; + [StepView addSubview:stepBackImg]; + + + self.allNumberLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15), StepView.height - 12 - kRealValue(8), StepView.width - kRealValue(30), 12)]; + self.allNumberLabel.text = @"累计约步行--公里"; + self.allNumberLabel.textColor = UIColorHex(#77849E); + self.allNumberLabel.font = MEDIUMFONT(12); + self.allNumberLabel.textAlignment = NSTextAlignmentLeft; + [StepView addSubview:self.allNumberLabel]; + + self.numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15), self.allNumberLabel.top - 28 - kRealValue(12), StepView.width - kRealValue(30), 28)]; + self.numberLabel.text = @"--步"; + self.numberLabel.textColor = UIColorHex(#77849E); + self.numberLabel.font = BOLDSYSTEMFONT(28); + self.numberLabel.textAlignment = NSTextAlignmentLeft; + [StepView addSubview:self.numberLabel]; + + + + + //睡眠 + UIView * sleepView = [[UIView alloc] initWithFrame:CGRectMake(StepView.right + kRealValue(15), kRealValue(15), ( kScreenWidth - kRealValue(45))/2, kRealValue(165))]; + sleepView.layer.cornerRadius = 15.0; + sleepView.layer.masksToBounds = YES; + sleepView.backgroundColor = KWhiteColor; + UITapGestureRecognizer *sleepGesture=[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(sleepAction)]; + [sleepView addGestureRecognizer:sleepGesture]; + [self addSubview:sleepView]; + + UIImageView * sleepImg = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(12), kRealValue(16), kRealValue(32), kRealValue(32))]; + sleepImg.image = [UIImage imageNamed:@"sleepIcon"]; + [sleepView addSubview:sleepImg]; + + + UILabel * sleepLab = [[UILabel alloc] initWithFrame:CGRectMake(sleepImg.right + kRealValue(12), kRealValue(14), StepView.width - kRealValue(46), 16)]; + sleepLab.text = @"睡眠"; + sleepLab.textColor = CFontColor1; + sleepLab.font = BOLDSYSTEMFONT(16); + sleepLab.textAlignment = NSTextAlignmentLeft; + [sleepView addSubview:sleepLab]; + + self.sleepTimeLabel = [[UILabel alloc] initWithFrame:CGRectMake(sleepImg.right + kRealValue(12),sleepLab.bottom + kRealValue(9), sleepView.width - kRealValue(46), 16)]; + self.sleepTimeLabel.text = @"--/--/--"; + self.sleepTimeLabel.textColor = UIColorHex(#77849E); + self.sleepTimeLabel.font = SYSTEMFONT(13); + self.sleepTimeLabel.textAlignment = NSTextAlignmentLeft; + [sleepView addSubview:self.sleepTimeLabel]; + + UIButton * sleepIconBtn = [[UIButton alloc] initWithFrame:CGRectMake(sleepView.width - kRealValue(9) - 20, kRealValue(16), 20, 20)]; + [sleepIconBtn setImage:[UIImage imageNamed:@"garyRight"] forState:UIControlStateNormal]; + [sleepView addSubview:sleepIconBtn]; + + UIView * blueView = [[UIView alloc] initWithFrame:CGRectMake(sleepView.width - kRealValue(29) , self.sleepTimeLabel.bottom + kRealValue(11), kRealValue(17), kRealValue(34))]; + CAGradientLayer *gradientLayer = [CAGradientLayer layer]; + gradientLayer.frame = blueView.bounds; + gradientLayer.colors = @[(__bridge id)RGBA(1, 142, 253, 0.5).CGColor, (__bridge id)UIColorHex(#FFFFFF).CGColor]; + gradientLayer.startPoint = CGPointMake(0, 0); + gradientLayer.endPoint = CGPointMake(0, 1); + gradientLayer.transform = CATransform3DMakeRotation(0, 0, 0, 1); + [blueView.layer addSublayer:gradientLayer]; + [sleepView addSubview:blueView]; + UIView * blueLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, blueView.width, 2)]; + blueLine.backgroundColor = UIColorHex(#018EFD); + [blueView addSubview:blueLine]; + + UIView * orangeView = [[UIView alloc] initWithFrame:CGRectMake(blueView.left - kRealValue(5) , self.sleepTimeLabel.bottom + kRealValue(11), kRealValue(4), kRealValue(34))]; + CAGradientLayer * orangegradientLayer = [CAGradientLayer layer]; + orangegradientLayer.frame = orangeView.bounds; + orangegradientLayer.colors = @[(__bridge id)RGBA(253, 193, 32, 0.5).CGColor, (__bridge id)UIColorHex(#FFFFFF).CGColor]; + orangegradientLayer.startPoint = CGPointMake(0, 0); + orangegradientLayer.endPoint = CGPointMake(0, 1); + orangegradientLayer.transform = CATransform3DMakeRotation(0, 0, 0, 1); + [orangeView.layer addSublayer:orangegradientLayer]; + [sleepView addSubview:orangeView]; + UIView * orangeLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, orangeView.width, 2)]; + orangeLine.backgroundColor = RGBA(253, 193, 32, 1); + [orangeView addSubview:orangeLine]; + + UIView * pickView = [[UIView alloc] initWithFrame:CGRectMake(orangeView.left - kRealValue(35) , self.sleepTimeLabel.bottom + kRealValue(11), kRealValue(34), kRealValue(34))]; + CAGradientLayer * pickViewgradientLayer = [CAGradientLayer layer]; + pickViewgradientLayer.frame = pickView.bounds; + pickViewgradientLayer.colors = @[(__bridge id)RGBA(252, 120, 117, 0.5).CGColor, (__bridge id)UIColorHex(#FFFFFF).CGColor]; + pickViewgradientLayer.startPoint = CGPointMake(0, 0); + pickViewgradientLayer.endPoint = CGPointMake(0, 1); + pickViewgradientLayer.transform = CATransform3DMakeRotation(0, 0, 0, 1); + [pickView.layer addSublayer:pickViewgradientLayer]; + [sleepView addSubview:pickView]; + UIView * pickLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, pickView.width, 2)]; + pickLine.backgroundColor = RGBA(252, 120, 117, 1); + [pickView addSubview:pickLine]; + + UIView * purpleView = [[UIView alloc] initWithFrame:CGRectMake(pickView.left - kRealValue(45) , self.sleepTimeLabel.bottom + kRealValue(11), kRealValue(44), kRealValue(34))]; + CAGradientLayer * pupleViewgradientLayer = [CAGradientLayer layer]; + pupleViewgradientLayer.frame = purpleView.bounds; + pupleViewgradientLayer.colors = @[(__bridge id)RGBA(203, 45, 218, 0.5).CGColor, (__bridge id)UIColorHex(#FFFFFF).CGColor]; + pupleViewgradientLayer.startPoint = CGPointMake(0, 0); + pupleViewgradientLayer.endPoint = CGPointMake(0, 1); + pupleViewgradientLayer.transform = CATransform3DMakeRotation(0, 0, 0, 1); + [purpleView.layer addSublayer:pupleViewgradientLayer]; + [sleepView addSubview:purpleView]; + UIView * purpleLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, purpleView.width, 2)]; + purpleLine.backgroundColor = RGBA(203, 45, 218, 1); + [purpleView addSubview:purpleLine]; + + UIView * blackPurple = [[UIView alloc] initWithFrame:CGRectMake(purpleView.left - kRealValue(39) , self.sleepTimeLabel.bottom + kRealValue(11), kRealValue(38), kRealValue(34))]; + CAGradientLayer * blackPurplegradientLayer = [CAGradientLayer layer]; + blackPurplegradientLayer.frame = blackPurple.bounds; + blackPurplegradientLayer.colors = @[(__bridge id)RGBA(155, 70, 225, 0.5).CGColor, (__bridge id)UIColorHex(#FFFFFF).CGColor]; + blackPurplegradientLayer.startPoint = CGPointMake(0, 0); + blackPurplegradientLayer.endPoint = CGPointMake(0, 1); + blackPurplegradientLayer.transform = CATransform3DMakeRotation(0, 0, 0, 1); + [blackPurple.layer addSublayer:blackPurplegradientLayer]; + [sleepView addSubview:blackPurple]; + UIView * blackPurpleLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, blackPurple.width, 2)]; + blackPurpleLine.backgroundColor = RGBA(155, 70, 225, 1); + [blackPurple addSubview:blackPurpleLine]; + + + self.avgTimeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15), sleepView.height - 12 - kRealValue(8), StepView.width - kRealValue(30), 12)]; + self.avgTimeLabel.text = @"平均睡眠--小时"; + self.avgTimeLabel.textColor = UIColorHex(#77849E); + self.avgTimeLabel.font = MEDIUMFONT(12); + self.avgTimeLabel.textAlignment = NSTextAlignmentLeft; + [sleepView addSubview:self.avgTimeLabel]; + + self.subTimeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15),self.avgTimeLabel.top - 28 - kRealValue(12), StepView.width - kRealValue(30), 28)]; + self.subTimeLabel.text = @"--小时--分"; + self.subTimeLabel.textColor = UIColorHex(#77849E); + self.subTimeLabel.font = BOLDSYSTEMFONT(28); + self.subTimeLabel.textAlignment = NSTextAlignmentLeft; + [sleepView addSubview:self.subTimeLabel]; +} + +- (void)setHeardModel:(MonitoringDataModel *)heardModel { + + _heardModel = heardModel; + + self.allNumberLabel.text = [NSString stringWithFormat:@"累计约步行%.0f公里",_heardModel.distance]; + + CGFloat minutes = _heardModel.aveSleep; + NSString *timeString; + if (minutes == 0) { + timeString = @"--"; + } else if (minutes < 1) { + int seconds = (int)roundf(minutes * 60); + timeString = [NSString stringWithFormat:@"%d秒", seconds]; + } else if (minutes < 60) { + timeString = [NSString stringWithFormat:@"%.2f分钟", minutes]; + } else { + int wholeHours = (int)(minutes / 60); + int remainingMinutes = (int)(minutes - (wholeHours * 60)); + timeString = [NSString stringWithFormat:@"%d小时%d分钟", wholeHours, remainingMinutes]; + } + + self.avgTimeLabel.text = [NSString stringWithFormat:@"平均睡眠%@",timeString]; + + for (MonitoringListDataModel * listModel in _heardModel.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"步数"]) { + + self.timeLabel.text =listModel.dataDate; + + self.numberLabel.attributedText = [self attributedStringWithText:[NSString stringWithFormat:@"%@步",SafeStr(listModel.dataValue)] numberColor:UIColorHex(#42ADF2)]; + } + if ([listModel.wdTypeName isEqualToString:@"睡眠"]) { + + + self.sleepTimeLabel.text =listModel.dataDate; + + self.subTimeLabel.attributedText = [self convertMinutes:[listModel.dataValue floatValue] withFont:[UIFont systemFontOfSize:24 weight:UIFontWeightBold] withColor:UIColorHex(#9B46E1)]; + } + } + + +} + + + + +- (NSMutableAttributedString *)convertMinutes:(float)minutes withFont:(UIFont *)font withColor:(UIColor *)color { + NSString *timeString; + + if (minutes == 0) { + timeString = @"--"; + } else if (minutes < 1) { + int seconds = (int)roundf(minutes * 60); + timeString = [NSString stringWithFormat:@"%d秒", seconds]; + } else if (minutes < 60) { + timeString = [NSString stringWithFormat:@"%.0f分钟", minutes]; + } else { + int wholeHours = (int)(minutes / 60); + int remainingMinutes = (int)(minutes - (wholeHours * 60)); + timeString = [NSString stringWithFormat:@"%d小时%d分钟", wholeHours, remainingMinutes]; + } + + NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:timeString]; + + // 整体默认样式 + [attributedString addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:12], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, timeString.length)]; + + // 匹配数字并加粗放大 + NSError *error = nil; + NSRegularExpression *numberRegex = [NSRegularExpression regularExpressionWithPattern:@"\\d+(\\.\\d+)?" + options:0 + error:&error]; + if (!error) { + NSArray *matches = [numberRegex matchesInString:timeString options:0 range:NSMakeRange(0, timeString.length)]; + for (NSTextCheckingResult *match in matches) { + [attributedString addAttributes:@{ + NSFontAttributeName: font, + NSForegroundColorAttributeName: color + } range:match.range]; + } + } + + // 设置单位样式（小时 / 分钟 / 秒） + UIFont *unitFont = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; + UIColor *unitColor = UIColorHex(#252535); + + NSArray *units = @[@"小时", @"分钟", @"秒"]; + for (NSString *unit in units) { + NSRange unitRange = [timeString rangeOfString:unit]; + if (unitRange.location != NSNotFound) { + [attributedString addAttributes:@{ + NSFontAttributeName: unitFont, + NSForegroundColorAttributeName: unitColor + } range:unitRange]; + } + } + + return attributedString; +} + + + +/// 传入字符串和数字颜色，返回符合需求的富文本 +- (NSAttributedString *)attributedStringWithText:(NSString *)text numberColor:(UIColor *)numberColor { + if (text.length == 0) { + NSMutableAttributedString *emptyStr = [[NSMutableAttributedString alloc] initWithString:@""]; + [emptyStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:12], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, 0)]; + return emptyStr; + } + + // 替换单个 "-" 为 "--" + NSString *processedText = [text stringByReplacingOccurrencesOfString:@"-" withString:@"--"]; + + NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString:processedText]; + + // 默认样式 + [attributedStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:13], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, processedText.length)]; + + // 匹配数字或 "--" + NSError *error = nil; + NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"\\d+(\\.\\d+)?|--" + options:0 + error:&error]; + if (error) { + return attributedStr; + } + + NSArray *matches = [regex matchesInString:processedText options:0 range:NSMakeRange(0, processedText.length)]; + for (NSTextCheckingResult *match in matches) { + NSRange range = match.range; + [attributedStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:28 weight:UIFontWeightBold], + NSForegroundColorAttributeName: numberColor ?: [UIColor redColor] + } range:range]; + } + + return attributedStr; +} + +//步数 +- (void)clickAction { + + for (MonitoringListDataModel * listModel in _heardModel.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"步数"]) { + + if (self.heardBlock) { + + self.heardBlock(listModel.wdType, listModel.dataDate); + } + } + + } + +} +- (void)sleepAction { + + for (MonitoringListDataModel * listModel in _heardModel.indexItemVos) { + + + if ([listModel.wdTypeName isEqualToString:@"睡眠"]) { + + + if (self.heardBlock) { + + self.heardBlock(listModel.wdType, listModel.dataDate); + } + } + } + +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableFooterView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableFooterView.h new file mode 100644 index 0000000..b3164df --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableFooterView.h @@ -0,0 +1,20 @@ +// +// MonitoringWatchTableFooterView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import +#import "MonitoringDataModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringWatchTableFooterView : UIView + +@property (nonatomic, strong) MonitoringDataModel * footModel; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableFooterView.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableFooterView.m new file mode 100644 index 0000000..d564da9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableFooterView.m @@ -0,0 +1,99 @@ +// +// MonitoringWatchTableFooterView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import "MonitoringWatchTableFooterView.h" + +@interface MonitoringWatchTableFooterView () + +@property (nonatomic, strong) UIView * warnView ; + +@property (nonatomic, strong) UILabel * contLabel ; + + +@end + +@implementation MonitoringWatchTableFooterView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +- (instancetype)initWithFrame:(CGRect)frame { + + if (self = [super initWithFrame:frame]) { + + [self createUI]; + } + return self; +} + +- (void)createUI { + + + UIView * watchView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), kRealValue(16), kScreenWidth - kRealValue(30), kRealValue(143))]; + watchView.layer.cornerRadius = 15; + watchView.backgroundColor = KWhiteColor; + watchView.layer.masksToBounds = true; + [self addSubview:watchView]; + CGFloat footWidth = (watchView.width - kRealValue(60))/3; + + for (int i = 0; i < 3; i ++) { + + UIView * footView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15) + (footWidth + kRealValue(15) )* i, kRealValue(11), footWidth, kRealValue(123))]; + footView.layer.cornerRadius = 15; + footView.backgroundColor = KWhiteColor; + footView.layer.masksToBounds = true; + + UILabel * titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, kRealValue(19), footWidth, 16)]; + titleLabel.font = BOLDSYSTEMFONT(16); + titleLabel.textAlignment = NSTextAlignmentCenter; + + UILabel * contLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, titleLabel.bottom + kRealValue(12), footWidth, footView.height - kRealValue(56))]; + contLabel.font = MEDIUMFONT(12); + contLabel.numberOfLines = 0; + self.contLabel = contLabel; + contLabel.textColor = UIColorHex(#77849E); + contLabel.textAlignment = NSTextAlignmentCenter; + + if (i == 0) { + footView.backgroundColor = UIColorHex(#E3F2F9); + titleLabel.text = @"穿戴设备"; + titleLabel.textColor = UIColorHex(#0789C0); + contLabel.text = @"佩戴90天23小时\n充电284次"; + + } + if (i == 1) { + footView.backgroundColor = UIColorHex(#FFF3EB); + titleLabel.text = @"预警研究"; + titleLabel.textColor = UIColorHex(#E7AE84); + contLabel.text = @"心率失常权重 \n 心率失常权重 \n 心率失常权重"; + } + if (i == 2) { + footView.backgroundColor = UIColorHex(#FFEFF2); + titleLabel.text = @"心脏体检"; + titleLabel.textColor = UIColorHex(#D16685); + contLabel.text = @"心电图正常 \n 心脏CTA正常 \n 检验指标正常"; + } + [watchView addSubview:footView]; + [footView addSubview:titleLabel]; + [footView addSubview:contLabel]; + } + +} + +- (void)setFootModel:(MonitoringDataModel *)footModel { + + _footModel = footModel; + + self.contLabel.text = [NSString stringWithFormat:@"佩戴%ld天",_footModel.days]; + +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableView.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableView.h new file mode 100644 index 0000000..4e47439 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableView.h @@ -0,0 +1,35 @@ +// +// MonitoringWatchTableView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import +#import "MonitoringDataModel.h" +#import "MonitoringWatchTableViewCell.h" +#import "MonitoringWarchTableHeardView.h" + +NS_ASSUME_NONNULL_BEGIN +typedef void(^lookDetailBlock)(NSString * type, NSString *time); +typedef void(^sleepAndStepDetailBlock)(NSString * type, NSString *time); + +@interface MonitoringWatchTableView : UITableView + +@property (nonatomic, strong) NSArray * dataArray; + +@property (nonatomic, assign) BOOL isHaveQustion; + +@property (nonatomic, strong) MonitoringDataModel * model; + +@property (nonatomic, copy) showPickStringBlock popBlock; + +@property (nonatomic, copy) lookDetailBlock detailBlock; + +@property (nonatomic, copy) sleepAndStepDetailBlock heardBlock; + +@property (nonatomic, copy) showHistoryListBlock historyBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableView.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableView.m new file mode 100644 index 0000000..e5f8d66 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableView.m @@ -0,0 +1,246 @@ +// +// MonitoringWatchTableView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import "MonitoringWatchTableView.h" +#import "MonitoringWarchTableHeardView.h" +#import "MonitoringWatchTableViewCell.h" +#import "MonitoringWatchTableFooterView.h" + +@interface MonitoringWatchTableView () + +@property (nonatomic, strong) MonitoringWarchTableHeardView * badHeardView; + +@property (nonatomic, strong) MonitoringWatchTableFooterView * badfooterView; + + +@end + +@implementation MonitoringWatchTableView + + +- (MonitoringWarchTableHeardView *)badHeardView { + + if (!_badHeardView) { + + _badHeardView = [[MonitoringWarchTableHeardView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(195))]; + MJWeakSelf + _badHeardView.heardBlock = ^(NSString * _Nonnull type, NSString * _Nonnull time) { + weakSelf.heardBlock(type, time); + }; + } + return _badHeardView; +} + +- (MonitoringWatchTableFooterView *)badfooterView { + + if (!_badfooterView) { + + _badfooterView = [[MonitoringWatchTableFooterView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(165))]; + } + return _badfooterView; + +} + +- (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style +{ + if (self = [super initWithFrame:frame style:style]) + { + [self createUI]; + } + return self; +} + + +- (void)createUI +{ + if ([[UIDevice currentDevice].systemVersion floatValue] >= 11) { + self.estimatedRowHeight = 0; + self.estimatedSectionFooterHeight = 0; + self.estimatedSectionHeaderHeight = 0; + self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.delegate = self; + self.backgroundColor = KClearColor; + self.dataSource = self; + self.separatorStyle = UITableViewCellSeparatorStyleNone; + self.showsVerticalScrollIndicator = NO; + self.tableHeaderView = self.badHeardView; +// self.tableFooterView = self.badfooterView; +} + +- (void)setModel:(MonitoringDataModel *)model { + + _model = model; + + self.badHeardView.heardModel = _model; + self.badfooterView.footModel = _model; + [self reloadData]; + +} + +#pragma mark - DataSource +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + + return 1; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 4; + +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + MonitoringWatchTableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"CELLID"]; + + if (!cell) { + + cell = [[MonitoringWatchTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CELLID"]; + } + cell.backgroundColor = CViewBgColor; + if (indexPath.section == 0) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"心率"]) { + cell.listModel = listModel; + } + + } + + + } + if (indexPath.section == 1) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"血氧饱和度"]) { + cell.listModel = listModel; + } + + } + + } + if (indexPath.section == 2) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"压力"]) { + cell.listModel = listModel; + } + + } + + } + if (indexPath.section == 3) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"体温"]) { + cell.listModel = listModel; + } + + } + + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.popBlock = self.popBlock; + cell.historyBlock = self.historyBlock; + return cell; +} + + + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + NSString * lookType; + if (indexPath.section == 0) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"心率"]) { + + if (self.detailBlock) { + self.detailBlock(listModel.wdType, listModel.dataDate); + } + } + + } + + + } + if (indexPath.section == 1) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"血氧饱和度"]) { + + if (self.detailBlock) { + self.detailBlock(listModel.wdType, listModel.dataDate); + } + } + + } + + } + if (indexPath.section == 2) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"压力"]) { + if (self.detailBlock) { + self.detailBlock(listModel.wdType, listModel.dataDate); + } + } + + } + + } + if (indexPath.section == 3) { + + for (MonitoringListDataModel * listModel in self.model.indexItemVos) { + + if ([listModel.wdTypeName isEqualToString:@"体温"]) { + if (self.detailBlock) { + self.detailBlock(listModel.wdType, listModel.dataDate); + } + } + + } + + } + +} + +- (CGFloat )tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return CGFLOAT_MIN; +} + +- (CGFloat )tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return kRealValue(15); +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + + return kRealValue(120); +} + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + + + return [UIView new]; + +} + + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h new file mode 100644 index 0000000..58a4b09 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h @@ -0,0 +1,27 @@ +// +// MonitoringWatchTableViewCell.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import +#import "MonitoringDataModel.h" + +typedef void(^showPickStringBlock)(NSString * type); + +typedef void(^showHistoryListBlock)(NSString * type); + +NS_ASSUME_NONNULL_BEGIN + +@interface MonitoringWatchTableViewCell : UITableViewCell + +@property (nonatomic, strong) MonitoringListDataModel * listModel; + +@property (nonatomic, copy) showPickStringBlock popBlock; + +@property (nonatomic, copy) showHistoryListBlock historyBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m new file mode 100644 index 0000000..c417c59 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m @@ -0,0 +1,199 @@ +// +// MonitoringWatchTableViewCell.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/14. +// + +#import "MonitoringWatchTableViewCell.h" + +@interface MonitoringWatchTableViewCell () + +@property (nonatomic, strong) UIImageView * projectImage; + +@property (nonatomic, strong) UILabel * projectName; + +@property (nonatomic, strong) UILabel * timeLabel; + +@property (nonatomic, strong) UILabel * dataLabel; + +@end + +@implementation MonitoringWatchTableViewCell + +- (void)awakeFromNib { + [super awakeFromNib]; + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { + + if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) { + + [self createUI]; + } + return self; +} + +- (void)createUI { + + UIView * backView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), 0, kScreenWidth - kRealValue(30), kRealValue(120))]; + backView.backgroundColor = KWhiteColor; + backView.layer.cornerRadius = 15.0; + backView.layer.masksToBounds = true; + [self.contentView addSubview:backView]; + + self.projectImage = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(12), kRealValue(22), kRealValue(32), kRealValue(32))]; + [backView addSubview:self.projectImage]; + + self.projectName = [[UILabel alloc] initWithFrame:CGRectMake(self.projectImage.right + kRealValue(12), kRealValue(20), backView.width - kRealValue(90), 15)]; + self.projectName.text = @"--"; + self.projectName.textColor = CFontColor1; + self.projectName.textAlignment = NSTextAlignmentLeft; + self.projectName.font = BOLDSYSTEMFONT(16); + [backView addSubview:self.projectName]; + + self.timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.projectImage.right + kRealValue(12),self.projectName.bottom + kRealValue(10), backView.width - kRealValue(90), 15)]; + self.timeLabel.text = @"--"; + self.timeLabel.textColor = UIColorHex(#77849E); + self.timeLabel.textAlignment = NSTextAlignmentLeft; + self.timeLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightRegular]; + [backView addSubview:self.timeLabel]; + + UIButton * accowBtn = [[UIButton alloc] initWithFrame:CGRectMake(backView.width - kRealValue(12) - 20, kRealValue(23), 15, 15)]; + [accowBtn setImage:[UIImage imageNamed:@"garyRight"] forState:UIControlStateNormal]; + accowBtn.userInteractionEnabled = false; + [backView addSubview:accowBtn]; + + self.dataLabel = [[UILabel alloc] initWithFrame:CGRectMake(accowBtn.left - kRealValue(5) - 200, kRealValue(22), 200, 22)]; + self.dataLabel.text = @"--"; + self.dataLabel.textColor = CFontColor1; + self.dataLabel.textAlignment = NSTextAlignmentRight; + self.dataLabel.font = BOLDSYSTEMFONT(16); + [backView addSubview:self.dataLabel]; + + UIView * lineView = [[UIView alloc] initWithFrame:CGRectMake(0, backView.bottom - kRealValue(44), backView.width, 1)]; + lineView.backgroundColor = UIColorHex(#EAECF1); + [backView addSubview:lineView]; + + UIButton * historyBtn = [[UIButton alloc] initWithFrame:CGRectMake(backView.width - kRealValue(82) ,backView.bottom - kRealValue(10) - kRealValue(24) , kRealValue(70), kRealValue(24))]; + [historyBtn setTitle:@"预警历史" forState:UIControlStateNormal]; + [historyBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; + historyBtn.layer.cornerRadius = 4.0; + historyBtn.layer.masksToBounds = true; + historyBtn.titleLabel.font = BOLDSYSTEMFONT(13); + historyBtn.backgroundColor = UIColorHex(#21BEBD); + [historyBtn addTarget:self action:@selector(historyList) forControlEvents:UIControlEventTouchUpInside]; + [backView addSubview:historyBtn]; + + + UIButton * thresholdBtn = [[UIButton alloc] initWithFrame:CGRectMake(historyBtn.left - kRealValue(82) ,backView.bottom - kRealValue(10) - kRealValue(24) , kRealValue(70), kRealValue(24))]; + [thresholdBtn setTitle:@"阈值设置" forState:UIControlStateNormal]; + [thresholdBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; + thresholdBtn.layer.cornerRadius = 4.0; + thresholdBtn.layer.masksToBounds = true; + thresholdBtn.titleLabel.font = BOLDSYSTEMFONT(13); + thresholdBtn.backgroundColor = UIColorHex(#F1B101); + [thresholdBtn addTarget:self action:@selector(popStringPick) forControlEvents:UIControlEventTouchUpInside]; + [backView addSubview:thresholdBtn]; +} +- (void)popStringPick { + + self.popBlock(self.listModel.wdType); + +} + +- (void)historyList { + + self.historyBlock(self.listModel.wdType); + +} + +- (void)setListModel:(MonitoringListDataModel *)listModel { + + _listModel = listModel; + + self.projectName.text = listModel.wdTypeName; + self.timeLabel.text = listModel.dataDate; + + UIColor * color; + if ([_listModel.wdTypeName isEqualToString:@"心率"]) { + color = UIColorHex(#F14D6B); + self.projectImage.image = [UIImage imageNamed:@"homePageXinlv"]; + NSString * dataString = [NSString stringWithFormat:@"%@次/分钟",SafeStr(_listModel.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + + + } + if ([listModel.wdTypeName isEqualToString:@"血氧饱和度"]) { + color = UIColorHex(#2AC79F); + self.projectImage.image = [UIImage imageNamed:@"homePageXueyang"]; + NSString * dataString = [NSString stringWithFormat:@"%@%%",SafeStr(_listModel.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + } + if ([listModel.wdTypeName isEqualToString:@"压力"]) { + color = UIColorHex(#1385FA); + self.projectImage.image = [UIImage imageNamed:@"homePageYali"]; + NSString * dataString = [NSString stringWithFormat:@"%@",SafeStr(_listModel.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + } + if ([listModel.wdTypeName isEqualToString:@"体温"]) { + color = UIColorHex(#02C7D2); + self.projectImage.image = [UIImage imageNamed:@"homePageTiwen"]; + NSString * dataString = [NSString stringWithFormat:@"%@℃",SafeStr(_listModel.dataValue)]; + self.dataLabel.attributedText = [self attributedStringWithText:dataString numberColor:color]; + } + +} + + +/// 传入字符串和数字颜色，返回符合需求的富文本 +- (NSAttributedString *)attributedStringWithText:(NSString *)text numberColor:(UIColor *)numberColor { + if (text.length == 0) { + NSMutableAttributedString *emptyStr = [[NSMutableAttributedString alloc] initWithString:@""]; + [emptyStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:12], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, 0)]; + return emptyStr; + } + + // 替换单个 "-" 为 "--" + NSString *processedText = [text stringByReplacingOccurrencesOfString:@"-" withString:@"--"]; + + NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString:processedText]; + + // 默认样式 + [attributedStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:12], + NSForegroundColorAttributeName: [UIColor blackColor] + } range:NSMakeRange(0, processedText.length)]; + + // 匹配数字或 "--" + NSError *error = nil; + NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"\\d+(\\.\\d+)?|--" + options:0 + error:&error]; + if (error) { + return attributedStr; + } + + NSArray *matches = [regex matchesInString:processedText options:0 range:NSMakeRange(0, processedText.length)]; + for (NSTextCheckingResult *match in matches) { + NSRange range = match.range; + [attributedStr addAttributes:@{ + NSFontAttributeName: [UIFont systemFontOfSize:24 weight:UIFontWeightBold], + NSForegroundColorAttributeName: numberColor ?: [UIColor redColor] + } range:range]; + } + + return attributedStr; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h index 98b07ca..2b0e26c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h @@ -1,6 +1,6 @@ // // EvaluationListViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m index c9cf91c..14f3538 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m @@ -1,6 +1,6 @@ // // EvaluationListViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h index 2d4a22b..2148615 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h @@ -1,6 +1,6 @@ // // ExpertMainViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m index 0c90e23..fcbfadc 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m @@ -1,6 +1,6 @@ // // ExpertMainViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h index be672bb..c95fb86 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h @@ -1,6 +1,6 @@ // // FileDataDetailViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m index a7e7502..33e7850 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m @@ -1,6 +1,6 @@ // // FileDataDetailViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h index 9d70418..e6dae8f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.h @@ -1,6 +1,6 @@ // // HospitalIntroViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m index fcba9ea..86454a8 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalIntroViewController.m @@ -1,6 +1,6 @@ // // HospitalIntroViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h index 29dcb0e..90e6396 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.h @@ -1,6 +1,6 @@ // // HospitalJianjieViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.m index 2da1181..bebe7ea 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalJianjieViewController.m @@ -1,6 +1,6 @@ // // HospitalJianjieViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h index 86c1781..965e354 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.h @@ -1,6 +1,6 @@ // // HospitalMainViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m index 042a45a..d615e58 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m @@ -1,6 +1,6 @@ // // HospitalMainViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h index ea204b1..03b9f09 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.h @@ -1,6 +1,6 @@ // // LookModficalFileViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/27. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m index dcb07ff..20828b7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/LookModficalFileViewController.m @@ -1,6 +1,6 @@ // // LookModficalFileViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/27. // @@ -16,7 +16,7 @@ #import "FileDataModel.h" #import "LookFileDataModel.h" #import "SOSGroupIMModel.h" -#import "DoctorMainViewController.h" +#import "XJDoctorMainViewController.h" #import "TZPhotoPreviewController.h" #import #import "TZImagePickerController.h" @@ -665,7 +665,7 @@ if ([tag isEqualToString:@"VIDEO"]) { NSString * resultString = response; - DoctorMainViewController * doctorVC = [[DoctorMainViewController alloc] init]; + XJDoctorMainViewController * doctorVC = [[XJDoctorMainViewController alloc] init]; doctorVC.yuyue_id = resultString; doctorVC.popType = 1; [self.navigationController pushViewController:doctorVC animated:YES]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h index 7168b14..8f73b0e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.h @@ -1,6 +1,6 @@ // // QuesstionDetailLookFileViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m index 169bad4..16ab094 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuesstionDetailLookFileViewController.m @@ -1,6 +1,6 @@ // // QuesstionDetailLookFileViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h index 9c3a7d2..e6396b6 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.h @@ -1,6 +1,6 @@ // // QuestionMustKnowViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m index 4f1f7fd..9d7f9c7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m @@ -1,6 +1,6 @@ // // QuestionMustKnowViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h index aa676f3..d452b55 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.h @@ -1,6 +1,6 @@ // // QuestionPeopleMangerVC.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m index 83290e5..512064b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m @@ -1,6 +1,6 @@ // // QuestionPeopleMangerVC.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // @@ -9,7 +9,7 @@ #import "QuestionPeopleManagerTable.h" #import "QuestionPeopleModel.h" #import "SelectedQuestionViewController.h" -#import "AddQuestionViewController.h" +#import "XJAddQuestionViewController.h" @interface QuestionPeopleMangerVC () @@ -62,7 +62,7 @@ __weak __typeof(self) weakSelf = self; self.homeTable.xiugaiBlcok = ^(QuestionPeopleModel * _Nullable model) { - AddQuestionViewController * selcetVC = [[AddQuestionViewController alloc] init]; + XJAddQuestionViewController * selcetVC = [[XJAddQuestionViewController alloc] init]; selcetVC.questionModel = model; [weakSelf.navigationController pushViewController:selcetVC animated:true]; @@ -161,7 +161,7 @@ - (void)addQuestionAction { - AddQuestionViewController * selcetVC = [[AddQuestionViewController alloc] init]; + XJAddQuestionViewController * selcetVC = [[XJAddQuestionViewController alloc] init]; // [self.navigationController pushViewController:selcetVC animated:true]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h index 8dc96c2..3fa698f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.h @@ -1,6 +1,6 @@ // // QuestionViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m index 559ee70..acfc768 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m @@ -1,6 +1,6 @@ // // QuestionViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/13. // @@ -10,10 +10,10 @@ #import "HealthyQuestionHeardView.h" #import "QuestionPeopleMangerVC.h" #import "FoundExpertViewController.h" -#import "DoctorMainViewController.h" +#import "XJDoctorMainViewController.h" #import "DoctorRecommendModel.h" #import "ExpertMainViewController.h" -#import "QustionRecordViewController.h" +#import "XJQustionRecordViewController.h" #import "ChatViewController.h" #import "QuesstionDetailLookFileViewController.h" #import "SmallHelpIMDataModel.h" @@ -24,7 +24,7 @@ #import "PSCheckVersionView.h" #import "RoomDoctorRecordsVC.h" #import "HomeQusetionRecordsModel.h" -#import "DoctorMainViewController.h" +#import "XJDoctorMainViewController.h" @interface QuestionViewController () @@ -32,7 +32,7 @@ @property (nonatomic, assign) NSInteger page; -@property (nonatomic, strong) PSCheckVersionView * checkVersionView; +//@property (nonatomic, strong) PSCheckVersionView * checkVersionView; @property (nonatomic, strong) UIView * coverView; //定位相关 @property (nonatomic, strong) AMapSearchAPI *search; @@ -173,12 +173,12 @@ #pragma mark:更新 - (void)getUpDateinfo { - NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - // 获取应用的版本号 - [parmDic setObject:@"com.question.QinghaiProvince" forKey:@"pkg"]; - - JKCQAPI * homeRemakerApi = [[JKCQAPI alloc] init:self tag:@"UPVERSION" NeedToken:@""]; - [homeRemakerApi getABMUpdate:parmDic]; +// NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; +// // 获取应用的版本号 +// [parmDic setObject:@"com.question.QinghaiProvince" forKey:@"pkg"]; +// +// JKCQAPI * homeRemakerApi = [[JKCQAPI alloc] init:self tag:@"UPVERSION" NeedToken:@""]; +// [homeRemakerApi getABMUpdate:parmDic]; } @@ -256,7 +256,7 @@ //1图文 2视频 if ([model.contentType intValue] == 2) { - DoctorMainViewController * doctorVC = [[DoctorMainViewController alloc] init]; + XJDoctorMainViewController * doctorVC = [[XJDoctorMainViewController alloc] init]; doctorVC.yuyue_id = model.records_id; doctorVC.popType = 1; [weakself.navigationController pushViewController:doctorVC animated:YES]; @@ -627,23 +627,23 @@ - (void)show:(PSAppInfo *)info { - if (_coverView) { return; } - - __weak typeof(self)weakSelf = self; - - self.checkVersionView = [[PSCheckVersionView alloc] - initWithAppInfo:info - confirm:^{ - [self jumpAppStoreUpdate]; - }]; - - [self.coverView addSubview:self.checkVersionView]; - [self.checkVersionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.equalTo(self.coverView).multipliedBy(0.69); - make.height.equalTo(self.coverView).multipliedBy(0.57); - make.center.equalTo(self.coverView); - }]; - [[UIApplication sharedApplication].keyWindow.rootViewController.view addSubview:self.coverView]; +// if (_coverView) { return; } +// +// __weak typeof(self)weakSelf = self; +// +// self.checkVersionView = [[PSCheckVersionView alloc] +// initWithAppInfo:info +// confirm:^{ +// [self jumpAppStoreUpdate]; +// }]; +// +// [self.coverView addSubview:self.checkVersionView]; +// [self.checkVersionView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.width.equalTo(self.coverView).multipliedBy(0.69); +// make.height.equalTo(self.coverView).multipliedBy(0.57); +// make.center.equalTo(self.coverView); +// }]; +// [[UIApplication sharedApplication].keyWindow.rootViewController.view addSubview:self.coverView]; } - (void)jumpAppStoreUpdate { @@ -699,7 +699,7 @@ - (void)myQuestionAction { - QustionRecordViewController * myVC = [[QustionRecordViewController alloc] init]; + XJQustionRecordViewController * myVC = [[XJQustionRecordViewController alloc] init]; [self.navigationController pushViewController:myVC animated:true]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h new file mode 100644 index 0000000..e9d2944 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.h @@ -0,0 +1,16 @@ +// +// XJAudioVideoRecordViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJAudioVideoRecordViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m new file mode 100644 index 0000000..18dde8c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m @@ -0,0 +1,229 @@ +// +// XJAudioVideoRecordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "XJAudioVideoRecordViewController.h" +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" +#import "RecordIMListDateModel.h" +#import "XJDoctorMainViewController.h" + +@interface XJAudioVideoRecordViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@end + +@implementation XJAudioVideoRecordViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 1; + self.type = @"3"; + [self createUI]; + [self createData]; +} + +- (void)createUI { + // 3 1 5 + NSArray * array = @[@"进行中",@"待确认",@"已完成"]; + + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(80); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(15) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(110)) style:UITableViewStyleGrouped]; + self.homeTable.detailBlock = ^(NSString * _Nonnull recordID, NSString * _Nonnull imID, NSString * _Nonnull memberId, RecordIMListDateModel * _Nonnull model) { + + XJDoctorMainViewController * doctorVC = [[XJDoctorMainViewController alloc] init]; + doctorVC.yuyue_id = recordID; + doctorVC.popType = 1; + [self.navigationController pushViewController:doctorVC animated:YES]; + }; + [self.view addSubview:self.homeTable]; + + + + [self.view addSubview:self.homeTable]; + + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + //元素竖直方向的间距 + emptyView.subViewMargin = 20.f; + //标题颜色 + emptyView.titleLabTextColor = [UIColor blackColor]; + //描述字体 + emptyView.detailLabFont = [UIFont systemFontOfSize:17]; + //按钮背景色 + emptyView.actionBtnBackGroundColor = KWhiteColor; + emptyView.actionBtnWidth = CGFLOAT_MIN; + emptyView.actionBtnHeight = CGFLOAT_MIN; + + //设置空内容占位图 + self.homeTable.ly_emptyView = emptyView; + +} +- (void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated]; + [self.homeTable.mj_header beginRefreshing]; +} +- (void)createData { + // type : 1 图文 2 音视频 + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [parmDic setObject: self.type forKey:@"status"]; + [parmDic setObject:@"2" forKey:@"type"]; + + JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + [recordApi GetQuestionRecordList:parmDic]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + if ([tag isEqualToString:@"RECORD"]) { + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + + for (NSDictionary * dic in array) { + + RecordIMListDateModel * model = [ RecordIMListDateModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } +} + +- (void)statusChange:(UIButton *)statusBtn { + + + if (statusBtn.tag == 1000) { + self.type = @"3"; + } + if (statusBtn.tag == 1001) { + self.type = @"1"; + } + if (statusBtn.tag == 1002) { + self.type = @"5"; + } + + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + [self.homeTable.mj_header beginRefreshing]; +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/QustionWaitEvlaViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h similarity index 53% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/QustionWaitEvlaViewController.h rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h index 38e533f..2b71679 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/QustionWaitEvlaViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.h @@ -1,6 +1,6 @@ // -// QustionWaitEvlaViewController.h -// EscortProject +// XJPictureRecordViewController.h +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface QustionWaitEvlaViewController : HQBaseViewController +@interface XJPictureRecordViewController : HQBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m new file mode 100644 index 0000000..ec77f50 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJPictureRecordViewController.m @@ -0,0 +1,477 @@ +// +// XJPictureRecordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "XJPictureRecordViewController.h" +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" +#import "RecordIMListDateModel.h" +#import "XJDoctorMainViewController.h" +@interface XJPictureRecordViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; +@property (nonatomic, strong) NSMutableArray * redCountArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, strong) NSMutableArray * groupIDArray; + +@property (nonatomic, strong) NSMutableArray * jingxingArray; + +@property (nonatomic, assign) NSInteger totalCount; + +@end + + +@implementation XJPictureRecordViewController + + +- (NSMutableArray *)groupIDArray { + + if (!_groupIDArray) { + + _groupIDArray = [[NSMutableArray alloc] init]; + + } + return _groupIDArray; + +} + +- (NSMutableArray *)redCountArray { + + if (!_redCountArray) { + + _redCountArray = [[NSMutableArray alloc] init]; + } + return _redCountArray; + +} +- (NSMutableArray *)jingxingArray { + + if (!_jingxingArray) { + + _jingxingArray = [[NSMutableArray alloc] init]; + + } + return _jingxingArray; + +} + + + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 0; + self.type = @"3"; + + [self createUI]; + + if ([ESCTUIManager TUIUserStatus] == false) { + + [self loginImAccount]; + } + + if ([self.type integerValue] == 3) + { + [self getChatList]; + } + else + { + [self createData]; + } + +} + +- (void)createUI { + + NSArray * array = @[@"进行中",@"已完成"]; + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(80); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(15) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.width = kRealValue(90); + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(110) ) style:UITableViewStyleGrouped]; + self.homeTable.detailBlock = ^(NSString * _Nonnull recordID, NSString * _Nonnull imID, NSString * _Nonnull memberId, RecordIMListDateModel * _Nonnull model) { + + XJDoctorMainViewController * doctorVC = [[XJDoctorMainViewController alloc] init]; + doctorVC.yuyue_id = imID; + doctorVC.popType = 1; + [self.navigationController pushViewController:doctorVC animated:YES]; + }; + [self.view addSubview:self.homeTable]; + + + + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(110)) style:UITableViewStyleGrouped]; + self.homeTable.detailBlock = ^(NSString * _Nonnull recordID, NSString * _Nonnull imID, NSString * _Nonnull memberId, RecordIMListDateModel * _Nonnull model) { + + +// DoctorMainViewController * doctorVC = [[DoctorMainViewController alloc] init]; +// doctorVC.yuyue_id = recordID; +// [self.navigationController pushViewController:doctorVC animated:YES]; + if ([TUILogin isUserLogined]) { + ChatViewController * chatVC = [[ChatViewController alloc] init]; + chatVC.isGroupID = YES; + chatVC.chatID = imID ; + chatVC.eableSendReport = true; + chatVC.eablehaveHelathData = false; + chatVC.navTitle = @"图文咨询"; + chatVC.isVideo = NO; + chatVC.pictureEnd_id = model.Record_id; + chatVC.questionType = 2; + chatVC.medicalRecordsId = memberId; + if ([model.contentStatus intValue] == 5) { + chatVC.isEveal = true; + }else + { + chatVC.isEveal = false; + } + if ([model.contentStatus intValue] >=4 ) { + chatVC.endRecordType = 100; + } + [self.navigationController pushViewController:chatVC animated:YES]; + }else + { + [self loginImAccount]; + } + + }; + [self.view addSubview:self.homeTable]; + + + + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 0; + if ([ESCTUIManager TUIUserStatus] == false) { + + [self loginImAccount]; + } + if ([self.type integerValue] == 3) + { + [self getChatList]; + } + else + { + [weakSelf createData]; + } + + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + if ([ESCTUIManager TUIUserStatus] == false) { + + [self loginImAccount]; + } + if ([self.type integerValue] == 3) + { + [self getChatList]; + } + else + { + [weakSelf createData]; + } + }]; + +} + +//获取腾讯im会话列表 + +- (void)getChatList { + + + V2TIMConversationListFilter *filter = [[V2TIMConversationListFilter alloc] init]; +// filter.type = V2TIM_C2C; //拉取单聊会话 + filter.type = V2TIM_GROUP; //拉取群聊会话 + [[V2TIMManager sharedInstance] getConversationListByFilter:filter nextSeq:self.pageNo count:50 succ:^(NSArray *list, uint64_t nextSeq, BOOL isFinished) { + // 获取会话列表成功，list 为会话列表 + if (self.pageNo == 0) { + [self.groupIDArray removeAllObjects]; + } + DLog(@"%@",list); + [self.redCountArray addObjectsFromArray:list]; + + for (V2TIMConversation * v2Model in list) { + [self.groupIDArray addObject: v2Model.groupID]; + + + } + [self postGroupArray:self.groupIDArray]; + } fail:^(int code, NSString *desc) { + // 获取会话列表失败 + }]; + +// //获取所以会话的未读总数 +// // filter.type = V2TIM_GROUP; //拉取群聊会话 +// +// [[V2TIMManager sharedInstance] getUnreadMessageCountByFilter:filter succ:^(UInt64 totalUnreadCount) { +// self.totalCount = totalUnreadCount; +// } fail:^(int code, NSString *desc) { +// +// }]; + +} + + +#pragma mark:上传id数组 +- (void)postGroupArray:(NSArray *)array { + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:array forKey:@"imIds"]; + [self showMBProgressHUDWithString:@"加载中,请稍候..." autoHidden:false]; + JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; + [recordApi PostGroupIDArray:parmDic]; +} + + +- (void)createData { + // type : 1 图文 2 音视频 + [self showMBProgressHUDWithString:@"加载中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [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:@""]; + [recordApi GetQuestionRecordList:parmDic]; + //getMineQuestionRecord +} + +- (void)loginImAccount { + + + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + [proctocolApi GetIMLoginAccount:nil]; + + + +} + + + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + if ([tag isEqualToString:@"RECORD"]) { + if (self.pageNo == 0) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + + for (NSDictionary * dic in array) { + + RecordIMListDateModel * model = [ RecordIMListDateModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } + if ([tag isEqualToString:@"IMAPI"]) { + [self hiddenAllMBProgressHUD]; + + NSDictionary * pamrDic = response; + + IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; + + IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; + iminfoModel.IMInfo = pamrDic; + [HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; + + // 1. 从即时通信 IM 控制台获取应用 SDKAppID。 + // 2. 初始化 config 对象 + V2TIMSDKConfig *config = [[V2TIMSDKConfig alloc] init]; + // 3. 指定 log 输出级别。 + config.logLevel = V2TIM_LOG_INFO; + // 4. 添加 V2TIMSDKListener 的事件监听器，self 是 id 的实现类，如果您不需要监听 IM SDK 的事件，这个步骤可以忽略。 + [[V2TIMManager sharedInstance] addIMSDKListener:self]; + // 5. 初始化 IM SDK，调用这个接口后，可以立即调用登录接口。 + [[V2TIMManager sharedInstance] initSDK:[model.sdkAppId intValue] config:config]; + + // 1. 从即时通信 IM 控制台获取应用 SDKAppID。 + // 2. 初始化 config 对象 + + // 3. 指定 log 输出级别。 + config.logLevel = V2TIM_LOG_INFO; + // 4. 添加 V2TIMSDKListener 的事件监听器，self 是 id 的实现类，如果您不需要监听 IM SDK 的事件，这个步骤可以忽略。 + // 5. 初始化 IM SDK，调用这个接口后，可以立即调用登录接口。 + + [TUILogin login:[model.sdkAppId intValue] userID:model.userId userSig:model.userSig succ:^{ + + [self getChatList]; + + } fail:^(int code, NSString *msg) { + + [EasyTextView showErrorText:msg]; + + }]; + + + + + } + if ([tag isEqualToString:@"GROUPID"]) { + [self hiddenAllMBProgressHUD]; + NSArray * array = response; + [self.jingxingArray removeAllObjects]; + for (NSDictionary * parmDic in array) { + + RecordIMListDateModel * model = [ RecordIMListDateModel modelWithDictionary:parmDic]; + + for (V2TIMConversation * v2Model in self.redCountArray) { + + if ([v2Model.groupID isEqualToString:model.imId]) + { + model.unredCount = v2Model.unreadCount; + } + } + + [self.jingxingArray addObject:model]; + } + self.homeTable.dataArray = self.jingxingArray; +// self.homeTable.totalCount + } +} + +- (void)statusChange:(UIButton *)statusBtn { + + [self.dataArray removeAllObjects]; + + if (statusBtn.tag == 1000) { + self.type = @"3"; //进行中 + [self getChatList]; + + } + if (statusBtn.tag == 1001) { + self.type = @"5"; //已评价 + [self createData]; + } + if (statusBtn.tag == 1002) { + self.type = @""; //全部 历史 + [self createData]; + } + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } + +} + +//在线时票据过期：此时您需要生成新的 userSig，并再次重新调用初始化。 +- (void)onKickedOffline { + + [HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; + [ESCTUIManager outLoginTUISDK]; + KPostNotification(KNotificationLoginStateChange, @NO); + +} +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h new file mode 100644 index 0000000..83a0dca --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.h @@ -0,0 +1,16 @@ +// +// XJQuestionCompleteViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJQuestionCompleteViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m new file mode 100644 index 0000000..2a2854f --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionCompleteViewController.m @@ -0,0 +1,196 @@ +// +// XJQuestionCompleteViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "XJQuestionCompleteViewController.h" +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" + +@interface XJQuestionCompleteViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@end + +@implementation XJQuestionCompleteViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 1; + self.type = @"1"; + [self createUI]; + [self createData]; +} + +- (void)createUI { + + NSArray * array = @[@"图文咨询",@"视频咨询"]; + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(80); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(15) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.width = kRealValue(90); + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [self.view addSubview:self.homeTable]; + + [self.homeTable mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(@50); + make.bottom.left.right.mas_offset(0); + }]; + + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + +} + +- (void)createData { + // type : 1 图文 2 音视频 + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [parmDic setObject:@"5" forKey:@"status"]; + [parmDic setObject:self.type forKey:@"type"]; + + JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + [recordApi GetQuestionRecordList:parmDic]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + if ([tag isEqualToString:@"RECORD"]) { + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + + for (NSDictionary * dic in array) { + + QuestionRecordModel * model = [QuestionRecordModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } +} + +- (void)statusChange:(UIButton *)statusBtn { + + if (statusBtn.tag == 1000) { + self.type = @"1"; + } + if (statusBtn.tag == 1001) { + self.type = @"2"; + } + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h new file mode 100644 index 0000000..ed49781 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.h @@ -0,0 +1,16 @@ +// +// XJQuestionJingxingViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJQuestionJingxingViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m new file mode 100644 index 0000000..17e6179 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQuestionJingxingViewController.m @@ -0,0 +1,196 @@ +// +// XJQuestionJingxingViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "XJQuestionJingxingViewController.h" +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" + +@interface XJQuestionJingxingViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@end + +@implementation XJQuestionJingxingViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 1; + self.type = @"1"; + [self createUI]; + [self createData]; +} + +- (void)createUI { + + NSArray * array = @[@"图文咨询",@"视频咨询"]; + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(80); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(15) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.width = kRealValue(90); + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [self.view addSubview:self.homeTable]; + + [self.homeTable mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(@50); + make.bottom.left.right.mas_offset(0); + }]; + + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + +} + +- (void)createData { + // type : 1 图文 2 音视频 + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [parmDic setObject:@"3" forKey:@"status"]; + [parmDic setObject:self.type forKey:@"type"]; + + JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + [recordApi GetQuestionRecordList:parmDic]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + if ([tag isEqualToString:@"RECORD"]) { + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + + for (NSDictionary * dic in array) { + + QuestionRecordModel * model = [QuestionRecordModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } +} + +- (void)statusChange:(UIButton *)statusBtn { + + if (statusBtn.tag == 1000) { + self.type = @"1"; + } + if (statusBtn.tag == 1001) { + self.type = @"2"; + } + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/QustionRecordViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h similarity index 53% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/QustionRecordViewController.h rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h index b6c59bf..7bf0e2a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/QustionRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.h @@ -1,6 +1,6 @@ // -// QustionRecordViewController.h -// EscortProject +// XJQustionRecordViewController.h +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface QustionRecordViewController : HQBaseViewController +@interface XJQustionRecordViewController : HQBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.m new file mode 100644 index 0000000..2e8dc32 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionRecordViewController.m @@ -0,0 +1,272 @@ +// +// XJQustionRecordViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "XJQustionRecordViewController.h" +#import "XJAudioVideoRecordViewController.h" +#import "XJPictureRecordViewController.h" +#import "XJQuestionCompleteViewController.h" +#import "XJQustionWaitEvlaViewController.h" +#import "XJQuestionJingxingViewController.h" +#import "XJQustionWaitEvlaViewController.h" + +@interface XJQustionRecordViewController () + +/** 顶部控件*/ +@property (nonatomic, weak) UIScrollView *topView; +/** 下划线 */ +@property (nonatomic, weak) UIView *lineView; +/** 滚动视图 */ +@property (nonatomic, weak) UICollectionView *collectionView; +/** 当前选中的按钮 */ +@property (nonatomic, weak) UIButton *selectButton; +/** 按钮数组 */ +@property (nonatomic, strong) NSMutableArray *titleButtons; + +@end + +@implementation XJQustionRecordViewController + +#pragma mark - 懒加载 +- (NSMutableArray *)titleButtons { + if (_titleButtons==nil) { + _titleButtons = [NSMutableArray array]; + } + return _titleButtons; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = NO; + self.navigationItem.title = @"我的咨询"; + self.view.backgroundColor = UIColorBackground; +// [self addNavigationItemWithImageNames:@[@"backIcon@2x"] isLeft:YES target:self action:@selector(popVc) tags:@[@"100"]]; + [self createUI]; + +} + +#pragma mark:返回 +- (void)popVc +{ + [self.navigationController popViewControllerAnimated:YES]; +} + +- (void)createUI +{ + [self setupNavgationBar]; + + // 添加底部内容view + [self setupBottomContentView]; + + // 添加所有子控制器 + [self setupAllChildViewController]; + + [self setupAllTitle]; + + // 不添加额外滚动区域 + self.automaticallyAdjustsScrollViewInsets = NO; +} + +#pragma mark - 添加所有的子控制器 +- (void)setupAllChildViewController { + + XJPictureRecordViewController * pictureVc = [[XJPictureRecordViewController alloc] init]; + pictureVc.view.backgroundColor = UIColorBackground; + pictureVc.navigationItem.title = @"图文咨询"; + [self addChildViewController:pictureVc]; + + // + XJAudioVideoRecordViewController * videoVc = [[XJAudioVideoRecordViewController alloc] init]; + videoVc.view.backgroundColor = UIColorBackground; + videoVc.navigationItem.title = @"视频咨询"; + [self addChildViewController:videoVc]; + // +// XJQuestionJingxingViewController * jingxingVc = [[XJQuestionJingxingViewController alloc] init]; +// jingxingVc.view.backgroundColor = UIColorBackground; +// jingxingVc.navigationItem.title = @"进行中"; +// [self addChildViewController:jingxingVc]; +// // +// QustionWaitEvlaViewController * evlVc = [[QustionWaitEvlaViewController alloc] init]; +// evlVc.view.backgroundColor = UIColorBackground; +// evlVc.navigationItem.title = @"待评价"; +// [self addChildViewController:evlVc]; +// // +// XJQuestionCompleteViewController * completeVc = [[XJQuestionCompleteViewController alloc] init]; +// completeVc.view.backgroundColor = UIColorBackground; +// completeVc.navigationItem.title = @"已完成"; +// [self addChildViewController:completeVc]; +} + +#pragma mark - 设置导航条内容 +- (void)setupNavgationBar { + UIScrollView *topView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 1, kScreenWidth, kRealValue(48))]; + topView.backgroundColor = [UIColor whiteColor]; + _topView = topView; + [self.view addSubview:topView]; +} + +#pragma mark - 按钮被点击 +- (void)titleClick:(UIButton *)titleButton{ + + NSInteger i = titleButton.tag; + // 重复点击标题按钮的时候,刷新当前界面 + if (titleButton == _selectButton) { + } + + [self selButton:titleButton]; + + //滚动collectionView 修改偏移量 + CGFloat offsetX = i * kScreenWidth; + _collectionView.contentOffset = CGPointMake(offsetX, 0); +} + +#pragma mark - 选中标题按钮 +- (void)selButton:(UIButton *)titleButton{ + + _selectButton.selected = NO; + titleButton.selected = YES; + _selectButton = titleButton; + + // 移动下划线的位置 + [UIView animateWithDuration:0.25 animations:^{ + _lineView.centerX = titleButton.centerX; + }]; +} + +#pragma mark - 添加标题 +- (void)setupAllTitle{ + + NSUInteger count = self.childViewControllers.count; + CGFloat btnX = 0; + CGFloat btnW = kScreenWidth/count; + CGFloat btnH = _topView.height; + for (int i = 0; i < count; i++) { + UIButton *titleButton = [UIButton buttonWithType:UIButtonTypeCustom]; + titleButton.tag = i; + + UIViewController *vc = self.childViewControllers[i]; + [titleButton setTitle:vc.navigationItem.title forState:UIControlStateNormal]; + // 设置标题颜色 + [titleButton setTitleColor:RGBA(34, 34, 34, 1) forState:UIControlStateSelected]; + [titleButton setTitleColor:RGBA(102, 102, 102, 1) forState:UIControlStateNormal]; + + // 设置标题字体 + titleButton.titleLabel.font = MEDIUMFONT(14); + + btnX = i * btnW; + + titleButton.frame = CGRectMake(btnX, 0, btnW, btnH); + + // 监听按钮点击 + [titleButton addTarget:self action:@selector(titleClick:) forControlEvents:UIControlEventTouchUpInside]; + + [_topView addSubview:titleButton]; + + if (i == 0) { + // 添加下划线 + // 下划线宽度 = 按钮文字宽度 + // 下划线中心点x = 按钮中心点x + CGFloat h = 5; + CGFloat y = kRealValue(45) ; + UIView *lineView =[[UIView alloc] init]; + // 位置和尺寸 + lineView.height = h; + // 先计算文字尺寸,在给label去赋值 + [titleButton.titleLabel sizeToFit]; + lineView.width = kRealValue(28); + lineView.centerX = titleButton.centerX; + lineView.mj_y = y; + lineView.backgroundColor = UIColorHex(#21BEBD); + _lineView = lineView; + [_topView addSubview:lineView]; + + [self titleClick:titleButton]; + } + [self.titleButtons addObject:titleButton]; + } +} + +#pragma mark - 添加底部内容view +- (void)setupBottomContentView +{ + // 创建一个流水布局 + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.itemSize = CGSizeMake(kScreenWidth, kScreenHeight-44); + + // 设置水平滚动方向 + layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; + layout.minimumInteritemSpacing = 0; + layout.minimumLineSpacing = 0; + + // 创建UICollectionView + UICollectionView *collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0,kRealValue(48), kScreenWidth, kScreenHeight - kRealValue(48) ) collectionViewLayout:layout]; + collectionView.backgroundColor = [UIColor whiteColor]; + [self.view addSubview:collectionView]; + _collectionView = collectionView; + collectionView.scrollsToTop = NO; + collectionView.scrollEnabled = YES; + // 开启分页 + collectionView.pagingEnabled = YES; + collectionView.showsHorizontalScrollIndicator = NO; + collectionView.bounces = YES; + + // 展示cell + collectionView.dataSource = self; + collectionView.delegate = self; + + // 注册cell + [collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:@"COUPCELLID"]; +} + +#pragma mark - UICollectionViewDelegate +// 滚动完成的时候就会调用 +- (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView{ + // 获取角标 + NSInteger i = scrollView.contentOffset.x / kScreenWidth; + + // 获取选中标题 + UIButton *selButton = self.titleButtons[i]; + + // 选中标题 + [self selButton:selButton]; +} + +#pragma mark - UICollectionViewDataSource +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ + + return self.childViewControllers.count; +} + +// 只要有新的cell出现的时候才会调用 +- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ + + UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"COUPCELLID" forIndexPath:indexPath]; + + // 移除之前子控制器view + [cell.contentView.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)]; + + // 取出对应的子控制器添加到对应cell上 + UIViewController *vc = self.childViewControllers[indexPath.row]; + + [cell.contentView addSubview:vc.view]; + + return cell; +} + + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h new file mode 100644 index 0000000..0cc201a --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.h @@ -0,0 +1,16 @@ +// +// XJQustionWaitEvlaViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJQustionWaitEvlaViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m new file mode 100644 index 0000000..0a5df37 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJQustionWaitEvlaViewController.m @@ -0,0 +1,196 @@ +// +// XJQustionWaitEvlaViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/28. +// + +#import "XJQustionWaitEvlaViewController.h" +#import "QuestionRecoredTable.h" +#import "QuestionRecordModel.h" + +@interface XJQustionWaitEvlaViewController () + +@property (nonatomic, strong) QuestionRecoredTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * buttonArray; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@property (nonatomic, assign) NSInteger pageNo; + +@property (nonatomic, copy) NSString * type; + +@end + +@implementation XJQustionWaitEvlaViewController + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + + _dataArray = [[NSMutableArray alloc] init]; + + } + return _dataArray; + +} + +- (NSMutableArray *)buttonArray { + + if (!_buttonArray) { + + _buttonArray = [[NSMutableArray alloc] init]; + + } + return _buttonArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.pageNo = 1; + self.type = @"1"; + [self createUI]; + [self createData]; +} + +- (void)createUI { + + NSArray * array = @[@"图文咨询",@"视频咨询"]; + [self.buttonArray removeAllObjects]; + CGFloat w = kRealValue(80); + for (int index = 0; index < array.count; index ++) { + + UIButton * listBtn = [[UIButton alloc] init]; + + listBtn.frame = CGRectMake(kRealValue(15) + (w + kRealValue(13)) * index , kRealValue(15), w, 27); + [listBtn setTitle:array[index] forState:UIControlStateNormal]; + [listBtn setTitleColor:KWhiteColor forState:UIControlStateSelected]; + [listBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [listBtn addTarget:self action:@selector(statusChange:) forControlEvents:UIControlEventTouchUpInside]; + listBtn.titleLabel.font = SYSTEMFONT(13); + listBtn.layer.cornerRadius = 14.0; + listBtn.layer.masksToBounds = true; + listBtn.tag = 1000 + index; + [self.view addSubview:listBtn]; + if (index == 0 ) { + listBtn.selected = YES; + listBtn.backgroundColor = UIColorHex(#21BEBD); + }else{ + listBtn.width = kRealValue(90); + listBtn.backgroundColor = UIColorHex(#DDDDDD); + } + [self.buttonArray addObject:listBtn]; + + } + + + + self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [self.view addSubview:self.homeTable]; + + [self.homeTable mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(@50); + make.bottom.left.right.mas_offset(0); + }]; + + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + weakSelf.pageNo = 1; + + [weakSelf createData]; + + + }]; + self.homeTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + weakSelf.pageNo ++; + [weakSelf createData]; + }]; + +} + +- (void)createData { + // type : 1 图文 2 音视频 + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; + [parmDic setObject:@(10) forKey:@"pageSize"]; + [parmDic setObject:@"4" forKey:@"status"]; + [parmDic setObject:self.type forKey:@"type"]; + + JKCQAPI * recordApi = [[JKCQAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; + [recordApi GetQuestionRecordList:parmDic]; +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self.homeTable.mj_footer endRefreshing]; + [self.homeTable.mj_header endRefreshing]; + + if ([tag isEqualToString:@"RECORD"]) { + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } + NSArray * array = response ; + + for (NSDictionary * dic in array) { + + QuestionRecordModel * model = [QuestionRecordModel modelWithDictionary:dic]; + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } +} + +- (void)statusChange:(UIButton *)statusBtn { + + if (statusBtn.tag == 1000) { + self.type = @"1"; + } + if (statusBtn.tag == 1001) { + self.type = @"2"; + } + for (UIButton * titBtn in self.buttonArray) { + + if (titBtn == statusBtn) { + + titBtn.selected = YES; + titBtn.backgroundColor = UIColorHex(#21BEBD); + + }else + { + titBtn.selected = NO; + titBtn.backgroundColor = UIColorHex(#DDDDDD); + } + + } +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h index 0e716f0..c3f5658 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.h @@ -1,6 +1,6 @@ // // RoomSearchResultViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/10/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m index 1396ac7..ebfa66e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomSearchResultViewController.m @@ -1,6 +1,6 @@ // // RoomSearchResultViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/10/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h index dae9643..3521de7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.h @@ -1,6 +1,6 @@ // // FoundExpertSubViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m index 495e789..276d157 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertSubViewController.m @@ -1,6 +1,6 @@ // // FoundExpertSubViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h index 19f3c05..cf2d636 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.h @@ -1,6 +1,6 @@ // // FoundExpertViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m index 7be4ff0..261aa30 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundExpertViewController.m @@ -1,6 +1,6 @@ // // FoundExpertViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h index 4d688be..ed8f016 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.h @@ -1,6 +1,6 @@ // // FoundHospitalViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m index d5d17f4..df84d57 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundHospitalViewController.m @@ -1,6 +1,6 @@ // // FoundHospitalViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h index 84dce0b..e4ce01c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.h @@ -1,6 +1,6 @@ // // FoundJIBingViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m index f68e809..3895bcf 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundJIBingViewController.m @@ -1,6 +1,6 @@ // // FoundJIBingViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h index c11d41f..5db5570 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.h @@ -1,6 +1,6 @@ // // FoundRoomsViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m index a0191eb..9b861e8 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/FoundRoomsViewController.m @@ -1,6 +1,6 @@ // // FoundRoomsViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h index b3ac5dc..e979df6 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.h @@ -1,6 +1,6 @@ // // MainSearchViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m index 56645e8..650999e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m @@ -1,6 +1,6 @@ // // MainSearchViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h index 27c2faa..6bafb9d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.h @@ -1,6 +1,6 @@ // // SearchJibingViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m index d059bab..8bb6bd0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m @@ -1,6 +1,6 @@ // // SearchZhuangJiaViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h index 885ef41..18ce129 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.h @@ -1,6 +1,6 @@ // // SearchMainViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/10. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.m index 9c51b00..5e199b1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SearchMainViewController.m @@ -1,6 +1,6 @@ // // SearchMainViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/10. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h index d1671f9..9a4a6db 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.h @@ -1,6 +1,6 @@ // // SelectFIleDateDetailViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m index e67dbc1..9509df8 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectFIleDateDetailViewController.m @@ -1,6 +1,6 @@ // // SelectFIleDateDetailViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h index de49173..cc17968 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.h @@ -1,6 +1,6 @@ // // SelectedDoctorTimeVC.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m index d14f1d9..2c92c2d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m @@ -1,6 +1,6 @@ // // SelectedDoctorTimeVC.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/21. // @@ -11,7 +11,7 @@ #import "ZHTagListView.h" #import "DoctorDetailModel.h" #import "DoctorTimeModel.h" -#import "DoctorMainViewController.h" +#import "XJDoctorMainViewController.h" #import "SelectedQuestionViewController.h" @interface SelectedDoctorTimeVC () diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h index 93c57dd..7ac0f2d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.h @@ -1,6 +1,6 @@ // // SelectedQuestionViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m index 2fb7a5d..5c0a4e7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m @@ -1,6 +1,6 @@ // // SelectedQuestionViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // @@ -13,7 +13,7 @@ #import "SelectedQuestionTypeTableCell.h" #import "LookModficalFileViewController.h" #import "SOSGroupIMModel.h" -#import "DoctorMainViewController.h" +#import "XJDoctorMainViewController.h" @interface SelectedQuestionViewController () @@ -342,7 +342,7 @@ if ([tag isEqualToString:@"VIDEO"]) { [self hiddenAllMBProgressHUD]; NSString * resultString = response; - DoctorMainViewController * doctorVC = [[DoctorMainViewController alloc] init]; + XJDoctorMainViewController * doctorVC = [[XJDoctorMainViewController alloc] init]; doctorVC.disModel = self.disModel; doctorVC.yuyue_id = resultString; [self.navigationController pushViewController:doctorVC animated:YES]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h index 93a0a0a..149381d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.h @@ -1,6 +1,6 @@ // // SmallHelpHandViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.m index d423e70..cb8e117 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SmallHelpHandViewController.m @@ -1,6 +1,6 @@ // // SmallHelpHandViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h new file mode 100644 index 0000000..efaad0d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.h @@ -0,0 +1,19 @@ +// +// XJAddQuestionViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/18. +// + +#import "HQBaseViewController.h" +#import "QuestionPeopleModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJAddQuestionViewController : HQBaseViewController + +@property (nonatomic, strong) QuestionPeopleModel * questionModel; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m new file mode 100644 index 0000000..95eb020 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m @@ -0,0 +1,597 @@ +// +// XJAddQuestionViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/18. +// + +#import "XJAddQuestionViewController.h" +#import "LineTextField.h" +#import "BRPickerView.h" +#import "FamilyMemberRelationModel.h" +#import "UserInfoHealthPopView.h" +#import "XJBasicHealthInfoViewController.h" + + +@interface XJAddQuestionViewController () + +@property (nonatomic, strong) LineTextField * questionNameField; + +@property (nonatomic, strong) UIButton * sexBtn; + +@property (nonatomic, strong) UILabel * birthdayLabel; + +@property (nonatomic, strong) LineTextField * birthdayTextField; + +@property (nonatomic, strong) UIButton * womanBtn ; + +@property (nonatomic, strong) UIButton * manBtn ; + +@property (nonatomic, strong) NSMutableArray * memberArray; + +@property (nonatomic, strong) LineTextField * heiTextField; + +@property (nonatomic, strong) LineTextField * weightTextField; + +@property (nonatomic, strong) LineTextField * relationshipTextField; + +@property (nonatomic, copy) NSString * familyInt; + +@property (nonatomic, strong) UserInfoHealthPopView * popView; + +@property (nonatomic, strong) LineTextField * baseHelathInfoField; + + +@property (nonatomic, copy) NSString * memberId; + +@property (nonatomic, assign) bool isJump; + +@end + +@implementation XJAddQuestionViewController + + +- (NSMutableArray *)memberArray { + + if (!_memberArray) { + + _memberArray = [[NSMutableArray alloc] init]; + } + return _memberArray; +} + +- (UserInfoHealthPopView *)popView { + + if (!_popView) { + + _popView = [[UserInfoHealthPopView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; + _popView.popDelegate = self; + } + + return _popView; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.view.backgroundColor = UIColorHex(#EFEFEF); + self.navigationItem.title = @"添加咨询人信息"; + + [self createUI]; + [self getFamilyMembers]; +} + +- (void)createUI { + + //咨询人姓名 + self.questionNameField = [self createFieldWithLeftTitle:@"咨询人姓名" withRightString:@"" placeholderStr:@"请填写咨询人姓名" isShowRight:true]; + self.questionNameField.frame = CGRectMake(0, 1, kScreenWidth, 51); + [self.view addSubview:self.questionNameField]; + + //性别选择 + UIView * sexView = [[UIView alloc] initWithFrame:CGRectMake(0, self.questionNameField.bottom, kScreenWidth, 51)]; + sexView.backgroundColor = KWhiteColor; + [self.view addSubview:sexView]; + + UILabel * sexlabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(16), 0, 100, 51)]; + sexlabel.text = @"性别"; + sexlabel.font = SYSTEMFONT(13); + sexlabel.textAlignment = NSTextAlignmentLeft; + sexlabel.textColor = UIColorHex(#666666); + [sexView addSubview:sexlabel]; + + UIButton * womanBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth - kRealValue(16) - 60, 0, 50, 51)]; + [womanBtn setImage:[UIImage imageNamed:@"choose_nomal"] forState:UIControlStateNormal]; + [womanBtn setImage:[UIImage imageNamed:@"choose_Selected"] forState:UIControlStateSelected]; + [womanBtn addTarget:self action:@selector(womanAction) forControlEvents:UIControlEventTouchUpInside]; + [womanBtn setTitle:@" 女" forState:UIControlStateNormal]; + womanBtn.titleLabel.font = SYSTEMFONT(13); + self.womanBtn = womanBtn; + [womanBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + [sexView addSubview:womanBtn]; + + UIButton * manBtn = [[UIButton alloc] initWithFrame:CGRectMake(womanBtn.left - 60, 0, 50, 51)]; + [manBtn setImage:[UIImage imageNamed:@"choose_nomal"] forState:UIControlStateNormal]; + [manBtn setImage:[UIImage imageNamed:@"choose_Selected"] forState:UIControlStateSelected]; + [manBtn setTitle:@" 男" forState:UIControlStateNormal]; + [manBtn addTarget:self action:@selector(manAction) forControlEvents:UIControlEventTouchUpInside]; + manBtn.titleLabel.font = SYSTEMFONT(13); + [manBtn setTitleColor:CFontColor1 forState:UIControlStateNormal]; + self.manBtn = manBtn; + [sexView addSubview:manBtn]; + + UIView * sexLineView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(14), sexView.bottom, kScreenWidth - kRealValue(28), 0.5)]; + sexLineView.backgroundColor = UIColorHex(#E0E0E0); + [self.view addSubview:sexLineView]; + + //出生日期 + + self.birthdayTextField = [self createFieldWithLeftTitle:@"出生日期" withRightString:@">" placeholderStr:@"请选择出生日期" isShowRight:true]; + + self.birthdayTextField.frame = CGRectMake(0, sexLineView.bottom, kScreenWidth, 51); + self.birthdayTextField.userInteractionEnabled = true; + [self.view addSubview:self.birthdayTextField]; + + UIButton * birBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 51)]; + [birBtn addTarget:self action:@selector(selectBirthdayOnclick) forControlEvents:UIControlEventTouchUpInside]; + [self.birthdayTextField addSubview:birBtn]; + + self.heiTextField = [self createFieldWithLeftTitle:@"身高" withRightString:@"cm" placeholderStr:@"请填写咨询人身高" isShowRight:true]; + self.heiTextField.keyboardType = UIKeyboardTypeNumberPad; + self.heiTextField.frame = CGRectMake(0, self.birthdayTextField.bottom, kScreenWidth, 51); + + [self.view addSubview:self.heiTextField]; + + + self.weightTextField = [self createFieldWithLeftTitle:@"体重" withRightString:@"kg" placeholderStr:@"请填写咨询人体重" isShowRight:true]; + self.weightTextField.keyboardType = UIKeyboardTypeDecimalPad; + self.weightTextField.frame = CGRectMake(0, self.heiTextField.bottom, kScreenWidth, 51); + + [self.view addSubview:self.weightTextField]; + + //与本人关系 + self.relationshipTextField = [self createFieldWithLeftTitle:@"与咨询人关系" withRightString:@">" placeholderStr:@"请点击选择" isShowRight:true]; + + self.relationshipTextField.frame = CGRectMake(0, self.weightTextField.bottom, kScreenWidth, 51); + self.relationshipTextField.userInteractionEnabled = true; + [self.view addSubview:self.relationshipTextField]; + + UIButton * shipBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 51)]; + [shipBtn addTarget:self action:@selector(relastionShipOnclick) forControlEvents:UIControlEventTouchUpInside]; + [self.relationshipTextField addSubview:shipBtn]; + + self.baseHelathInfoField = [self createFieldWithLeftTitle:@"基本健康信息" withRightString:@">" placeholderStr:@"" isShowRight:true]; + self.baseHelathInfoField.frame = CGRectMake(0, self.relationshipTextField.bottom + 5, kScreenWidth, 51); + self.baseHelathInfoField.userInteractionEnabled = true; + UIButton * baseBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 51)]; + [baseBtn addTarget:self action:@selector(healthInfoAction) forControlEvents:UIControlEventTouchUpInside]; + [self.baseHelathInfoField addSubview:baseBtn]; + [self.view addSubview:self.baseHelathInfoField]; + + + UILabel * tishiLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15), self.relationshipTextField.bottom + kRealValue(10) , kScreenWidth - kRealValue(30), 30)]; + + + tishiLabel.text = @"温馨提示：咨询人姓名、证件信息用于平台审核，不会外传。请输入正确的咨询人姓名和证件号码。"; + tishiLabel.numberOfLines = 0; + tishiLabel.font = SYSTEMFONT(12); + tishiLabel.textColor = UIColorHex(#999999); + CGFloat h = [HQCommonUtils getSpaceLabelHeight:tishiLabel withStr:tishiLabel.text withFont: SYSTEMFONT(12) withWidth:kScreenWidth withLineSpacing:2]; + tishiLabel.height = h ; + [self.view addSubview:tishiLabel]; + //保存按钮 + + UIButton * saveBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(48), kScreenHeight - kTopHeight - kTabBarHeight - 30 - 40, kScreenWidth - kRealValue(96), 40)]; + [saveBtn setTitle:@"保存" forState:UIControlStateNormal]; + saveBtn.titleLabel.font = SYSTEMFONT(14); + saveBtn.layer.cornerRadius = 20.0f; + saveBtn.layer.masksToBounds = true; + saveBtn.layer.borderColor = UIColorHex(#21BEBD).CGColor; + saveBtn.layer.borderWidth = 1.0f; + saveBtn.backgroundColor = KWhiteColor; + [saveBtn addTarget:self action:@selector(saveInfo) forControlEvents:UIControlEventTouchUpInside]; + [saveBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; + [self.view addSubview:saveBtn]; + + if (self.questionModel) { + self.baseHelathInfoField.hidden = false; + baseBtn.hidden = false; + tishiLabel.top = self.baseHelathInfoField.bottom + kRealValue(10); + self.questionNameField.text = self.questionModel.name; + self.relationshipTextField.text = self.questionModel.familyRelation; + self.weightTextField.text = [NSString stringWithFormat:@"%@",self.questionModel.weight]; + self.heiTextField.text = [NSString stringWithFormat:@"%@",self.questionModel.height]; + if ( [self.questionModel.gender integerValue] == 1 ) { + self.womanBtn.selected = true; + self.manBtn.selected = false; + }else + { + self.womanBtn.selected = false; + self.manBtn.selected = true; + } + self.birthdayTextField.text = [NSString stringWithFormat:@"%@",self.questionModel.birthday]; + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + //需要设置为和字符串相同的格式 + [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"]; + NSDate *localDate = [dateFormatter dateFromString:self.questionModel.birthday]; + NSString * str = [NSDate br_stringFromDate:localDate dateFormat:@"yyyy-MM-dd"]; + self.birthdayTextField.text = str; + + }else { + self.baseHelathInfoField.hidden = true; + baseBtn.hidden = true; + tishiLabel.top = self.relationshipTextField.bottom + kRealValue(10); + } +// [kAppWindow addSubview:self.popView]; + +} + + +- (LineTextField *)createFieldWithLeftTitle:(NSString *)leftStr + withRightString:(NSString *)rightStr + placeholderStr:(NSString *)placeStr + isShowRight:(BOOL)isShowRight { + + LineTextField * field = [[LineTextField alloc] init]; + field.font = SYSTEMFONT(13); + field.placeholder = placeStr; + field.textAlignment = NSTextAlignmentRight; + field.backgroundColor = KWhiteColor; + UIView * leftView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 51)]; + + UILabel * leftlabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(16), 0, 100, 51)]; + + leftlabel.text = leftStr; + + leftlabel.font = SYSTEMFONT(13); + + leftlabel.textAlignment = NSTextAlignmentLeft; + + leftlabel.textColor = UIColorHex(#666666); + + [leftView addSubview:leftlabel]; + + field.leftView = leftView; + + field.leftViewMode = UITextFieldViewModeAlways; + + if (isShowRight) { + + UIView * rightView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 30, 51)]; + + UILabel * rightlabel = [[UILabel alloc] initWithFrame:CGRectMake(5, 0, 30, 51)]; + + rightlabel.text = rightStr; + + rightlabel.font = SYSTEMFONT(13); + + rightlabel.textColor = UIColorHex(#666666); + + field.rightView = rightView; + + rightlabel.textAlignment = NSTextAlignmentLeft; + + field.rightViewMode = UITextFieldViewModeAlways; + + [rightView addSubview:rightlabel]; + + } + + return field; +} + +- (void)getFamilyMembers { + + JKCQAPI * memberApi = [[JKCQAPI alloc] init:self tag:@"Family" NeedToken:@""]; + + [memberApi getCheckKeyResult:@{@"dictKey":@"family_member_relation"}]; + +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [EasyTextView showErrorText:message]; + [self hiddenAllMBProgressHUD]; + +} + + +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"Family"]) { + + NSArray * array = response; + + for (NSDictionary * dic in array) { + + FamilyMemberRelationModel * model = [FamilyMemberRelationModel modelWithDictionary:dic] ; + + [self.memberArray addObject:model]; + } + } + if ([tag isEqualToString:@"ADDAPI"]) { + + self.memberId = response; + [self hiddenAllMBProgressHUD]; + if (self.isJump == true) { + [self.navigationController popViewControllerAnimated:YES]; + } + if (self.isJump == false) { + XJBasicHealthInfoViewController * basicVC = [[XJBasicHealthInfoViewController alloc] init]; + basicVC.memberId = self.memberId; + if (self.questionModel) { + basicVC.isAddQuetsion = false; + }else + { + basicVC.isAddQuetsion = true; + } + [self.navigationController pushViewController:basicVC animated:YES]; + } + + } + if ([tag isEqualToString:@"updataAPI"]) { + [self hiddenAllMBProgressHUD]; + [EasyTextView showSuccessText:@"保存成功"]; + [self.navigationController popViewControllerAnimated:YES]; + } +} + +- (void)selectBirthdayOnclick { + [self.view endEditing:TRUE]; + + // 1.创建日期选择器 + BRDatePickerView *datePickerView = [[BRDatePickerView alloc]init]; + // 2.设置属性 + datePickerView.pickerMode = BRDatePickerModeYMD; + datePickerView.title = @"选择出生日期"; + // datePickerView.selectValue = @"2019-10-30"; + datePickerView.minDate = [NSDate br_setYear:1949 month:3 day:12]; + datePickerView.maxDate = [NSDate date]; + datePickerView.isAutoSelect = YES; + datePickerView.showUnitType = BRShowUnitTypeOnlyCenter; + datePickerView.resultBlock = ^(NSDate *selectDate, NSString *selectValue) { + NSLog(@"选择的值：%@", selectValue); + self.birthdayTextField.text = selectValue; + }; + + datePickerView.pickerStyle = [BRPickerStyle pickerStyleWithThemeColor:UIColorHex(#21BEBD)]; + // 3.显示 + [datePickerView show]; +} + +- (void)relastionShipOnclick { + + /// 1.单列字符串选择器（传字符串数组） + BRStringPickerView *stringPickerView = [[BRStringPickerView alloc]init]; + stringPickerView.pickerMode = BRStringPickerComponentSingle; + stringPickerView.title = @"关系"; + + NSMutableArray * array = [[NSMutableArray alloc] init]; + for (FamilyMemberRelationModel * model in self.memberArray) { + + [array addObject:model.text]; + } + stringPickerView.dataSourceArr = array; + stringPickerView.selectIndex = 2; + stringPickerView.resultModelBlock = ^(BRResultModel *resultModel) { + NSLog(@"选择的值：%@", resultModel.value); + + + for (FamilyMemberRelationModel * model in self.memberArray) { + + if ([model.text isEqualToString:resultModel.value]) { + + self.familyInt = model.value; + } + + } + self.relationshipTextField.text = resultModel.value; + }; + + [stringPickerView show]; + +} + +- (void)womanAction { + + [self.view endEditing:TRUE]; + self.womanBtn.selected = true; + self.manBtn.selected = false; + +} + +- (void)manAction { + [self.view endEditing:TRUE]; + self.womanBtn.selected = false; + self.manBtn.selected = true; + +} + +- (void)saveInfo { + + [self.view endEditing:TRUE]; + + NSInteger sexInter; + + sexInter = self.womanBtn.selected == true ?1:2; + + if (ValidStr(self.questionNameField.text)) { + [EasyTextView showErrorText:@"请输入咨询人姓名"]; + return; + } + if (self.womanBtn.selected == false && self.manBtn.selected == false ) { + [EasyTextView showErrorText:@"请选择咨询人性别"]; + return; + } + if (ValidStr(self.birthdayTextField.text)) { + [EasyTextView showErrorText:@"请选择咨询人出生日期"]; + return; + } + if (ValidStr(self.heiTextField.text)) { + [EasyTextView showErrorText:@"请输入咨询人身高"]; + return; + } + if (ValidStr(self.weightTextField.text)) { + [EasyTextView showErrorText:@"请输入咨询人体重"]; + return; + } + if (ValidStr(self.relationshipTextField.text)) { + [EasyTextView showErrorText:@"请选择与咨询人关系"]; + return; + } + + if (self.questionModel) { + [self updateQuestionInfo]; + }else + { + + [kAppWindow addSubview:self.popView]; + } + + + + +} + +- (NSString *)getTimestampFromTime:(NSString *)CurrentTime{ + + + + + NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; + + [formatter setDateStyle:NSDateFormatterMediumStyle]; + + [formatter setTimeStyle:NSDateFormatterShortStyle]; + + [formatter setDateFormat:@"yyyy-MM-dd"]; //(@"YYYY-MM-dd hh:mm:ss") ----------设置你想要的格式,hh与HH的区别:分别表示12小时制,24小时制 + + //设置时区选择北京时间 + + NSTimeZone* timeZone = [NSTimeZone timeZoneWithName:@"Asia/Beijing"]; + + [formatter setTimeZone:timeZone]; + + NSDate* date = [formatter dateFromString:CurrentTime]; //------------将字符串按formatter转成nsdate + + //时间转时间戳的方法: + + NSInteger timeSp = [[NSNumber numberWithDouble:[date timeIntervalSince1970]] integerValue] * 1000; + + + return [NSString stringWithFormat:@"%ld",(long)timeSp]; + + + +} + +- (void)jumpOnclick { + + self.isJump = true; + [self.popView removeFromSuperview]; + [self addQuestionInfo]; + + +} + + +- (void)updateQuestionInfo { + + NSInteger sexInter; + + sexInter = self.womanBtn.selected == true ?1:2; + [self showMBProgressHUDWithString:@"更新中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + NSString * time = [self getTimestampFromTime:self.birthdayTextField.text]; + [parmDic setObject:self.questionNameField.text forKey:@"name"]; + [parmDic setObject:@(sexInter) forKey:@"gender"]; + [parmDic setObject:time forKey:@"birthdayLong"]; + [parmDic setObject:self.heiTextField.text forKey:@"height"]; + [parmDic setObject:self.weightTextField.text forKey:@"weight"]; + if (ValidStr(self.familyInt)) { + self.familyInt = self.questionModel.familyRelation; + } + [parmDic setObject:self.familyInt forKey:@"familyRelation"]; + [parmDic setObject:self.questionModel.people_id forKey:@"id"]; + JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"updataAPI" NeedToken:@""]; + + [api postUpdateQuestionFailyMembers:parmDic]; + +} + + +- (void)wanshanOnclick { + self.isJump = false; + [self.popView removeFromSuperview]; + [self addQuestionInfo]; + +} + + +- (void)addQuestionInfo { + + [self.view endEditing:TRUE]; + + NSInteger sexInter; + + sexInter = self.womanBtn.selected == true ?1:2; + + if (ValidStr(self.questionNameField.text)) { + [EasyTextView showErrorText:@"请输入咨询人姓名"]; + return; + } + if (self.womanBtn.selected == false && self.manBtn.selected == false ) { + [EasyTextView showErrorText:@"请选择咨询人性别"]; + return; + } + if (ValidStr(self.birthdayTextField.text)) { + [EasyTextView showErrorText:@"请选择咨询人出生日期"]; + return; + } + if (ValidStr(self.heiTextField.text)) { + [EasyTextView showErrorText:@"请输入咨询人身高"]; + return; + } + if (ValidStr(self.weightTextField.text)) { + [EasyTextView showErrorText:@"请输入咨询人体重"]; + return; + } + if (ValidStr(self.relationshipTextField.text)) { + [EasyTextView showErrorText:@"请选择与咨询人关系"]; + return; + } + [self showMBProgressHUDWithString:@"加载中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + NSString * time = [self getTimestampFromTime:self.birthdayTextField.text]; + [parmDic setObject:self.questionNameField.text forKey:@"name"]; + [parmDic setObject:@(sexInter) forKey:@"gender"]; + [parmDic setObject:time forKey:@"birthdayLong"]; + [parmDic setObject:self.heiTextField.text forKey:@"height"]; + [parmDic setObject:self.weightTextField.text forKey:@"weight"]; + [parmDic setObject:self.familyInt forKey:@"familyRelation"]; + + JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; + + [api getAddQuestionFailyMembers:parmDic]; + +} +- (void)healthInfoAction { + + XJBasicHealthInfoViewController * basicVC = [[XJBasicHealthInfoViewController alloc] init]; + basicVC.memberId = self.questionModel.people_id; + [self.navigationController pushViewController:basicVC animated:YES]; + +} +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h new file mode 100644 index 0000000..9909ae4 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.h @@ -0,0 +1,19 @@ +// +// XJBasicHealthInfoViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/21. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJBasicHealthInfoViewController : HQBaseViewController + +@property (nonatomic, strong) NSString * memberId; + +@property (nonatomic, assign) bool isAddQuetsion; +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m new file mode 100644 index 0000000..1cac0c3 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJBasicHealthInfoViewController.m @@ -0,0 +1,290 @@ +// +// XJBasicHealthInfoViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/21. +// + +#import "XJBasicHealthInfoViewController.h" +#import "BasicHealthTable.h" +#import "QuestionOptionModel.h" +#import "QuestionPeopleMangerVC.h" +@interface XJBasicHealthInfoViewController () + +@property (nonatomic, strong) BasicHealthTable * homeTable; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@end + +@implementation XJBasicHealthInfoViewController + + +- (NSMutableArray *)dataArray { + + if (!_dataArray) { + _dataArray = [[NSMutableArray alloc] init]; + } + return _dataArray; + +} + + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.navigationItem.title = @"基本健康信息"; + [self createUI]; + [self createData]; + [self addNavigationItemWithImageNames:@[@"whiteBack_icon"] isLeft:YES target:self action:@selector(backQuestionVC) tags:@[@"1"]]; + +} + +- (void)backQuestionVC { + + if (self.isAddQuetsion == true) { + + for (UIViewController *controller in self.navigationController.viewControllers) + { + if ([controller isKindOfClass:[QuestionPeopleMangerVC class]]) { + QuestionPeopleMangerVC * phyVC =(QuestionPeopleMangerVC *)controller; + [self.navigationController popToViewController:phyVC animated:false]; + } + } + }else + { + [self.navigationController popViewControllerAnimated:YES]; + } + +} + +- (void)createUI { + + self.homeTable = [[BasicHealthTable alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight) style:UITableViewStyleGrouped]; + self.homeTable.saveBlock = ^(NSArray * _Nonnull array) { + DLog(@"%@",array); + NSString * baseHealthId; + NSString * itemType; + NSString * itemOptions = @""; + NSMutableArray * customArray = [[NSMutableArray alloc] init]; + for (QuestionOptionModel * model in array) { + + for (QuestionOptionChildListModel * listModel in model.childList) { + baseHealthId = listModel.option_id; + itemType = listModel.itemType; + NSMutableDictionary * pamrDic = [[NSMutableDictionary alloc] init]; + for (QuestionOptionCustomModel * customModel in listModel.answerList) { + + [pamrDic setObject:customModel.value forKey:customModel.radioText]; +// itemOptions = [NSString stringWithFormat:@"%@,%@",currentString,itemOptions]; + itemOptions = [self convertToJSONData:pamrDic]; + + } + listModel.itemOptions = itemOptions; + itemOptions = @""; + } + + + + + [customArray addObject:model]; + } + DLog(@"%@",customArray); + [self saveBaseHealthInfo:customArray]; + + }; + [self.view addSubview:self.homeTable]; +} + +- (void)createData { + + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:self.memberId forKey:@"memberId"]; + + JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"MEMBERAPI" NeedToken:@""]; + + [detailApi getQustionOptionsMembers :parmDic]; + +} + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [self hiddenAllMBProgressHUD]; + [EasyTextView showSuccessText:message]; + + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self hiddenAllMBProgressHUD]; + if ([tag isEqualToString:@"MEMBERAPI"]) { + + NSArray * array = response; + + for (NSDictionary * dic in array) { + + QuestionOptionModel * model = [QuestionOptionModel modelWithDictionary:dic]; + + NSMutableArray * customAnswerArray = [[NSMutableArray alloc] init]; + + for (QuestionOptionChildListModel * optionModel in model.childList) { + + NSData *jsonData = [optionModel.itemOptions dataUsingEncoding:NSUTF8StringEncoding]; + + NSDictionary * dictionary = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:nil]; + + NSMutableArray * dicArray = [[NSMutableArray alloc] init]; + + + [dictionary enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) { + + NSDictionary * dic = @{@"radioText":key,@"itemType":optionModel.itemType,@"checked":@(false),@"value":[NSString stringWithFormat:@"%@",obj]}; + + NSString *mainString = optionModel.itemOptions; + NSString *subString = key; + + NSRange range = [mainString rangeOfString:subString]; + + if (range.location != NSNotFound) { + NSLog(@"Substring '%@' found at location %lu, length %lu", subString, (unsigned long)range.location, (unsigned long)range.length); + } else { + NSLog(@"Substring '%@' not found", subString); + } + + QuestionOptionCustomModel * model = [[QuestionOptionCustomModel alloc] init]; + model.radioText = key; + model.itemType = optionModel.itemType; + model.checked = false; + model.loctaionThin = range.location; + if ([optionModel.itemType intValue] == 4) { //带输入框 + + + }else + { + if ([obj boolValue] == true) { + optionModel.answerContent = key; + } + } + + model.value =[NSString stringWithFormat:@"%@",obj] ; + + + + [dicArray addObject:model]; + + optionModel.answerList = dicArray; + + }]; + + + } + + [self.dataArray addObject:model]; + } + self.homeTable.dataArray = self.dataArray; + + } + if ([tag isEqualToString:@"UPHEALTH"]) { + + [EasyTextView showSuccessText:response]; + [self backQuestionVC]; + } +} + +- (void)saveBaseHealthInfo:(NSArray *)array { + + + NSMutableArray * jsonArray = [[NSMutableArray alloc] init]; + + NSString * baseHealthId; + NSString * itemType; + NSString * itemOptions = @""; + NSMutableArray * customArray = [[NSMutableArray alloc] init]; + + for (QuestionOptionModel * model in array) { + + for (QuestionOptionChildListModel * listModel in model.childList) { + baseHealthId = listModel.option_id; + itemType = listModel.itemType; + NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; + [dic setObject:baseHealthId forKey:@"id"]; + [dic setObject:listModel.itemOptions forKey:@"itemOptions"]; + [dic setObject:listModel.itemType forKey:@"itemType"]; + [dic setObject:self.memberId forKey:@"memberId"]; + if (![listModel.itemOptions containsString:@"1"]) { + [EasyTextView showErrorText:[NSString stringWithFormat:@"请选择%@",listModel.itemProblem]]; + return; + } + if ([listModel.itemType intValue] == 4) { + NSString *itemOptionsJSONString = listModel.itemOptions; + + NSData *jsonData = [itemOptionsJSONString dataUsingEncoding:NSUTF8StringEncoding]; + NSDictionary *itemOptions = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil]; + if ([itemOptions[@"无"] isEqualToString:@"1"]) { + listModel.answerContent = @""; + } + + } + [dic setObject:listModel.answerContent forKey:@"answerContent"]; + + [jsonArray addObject:dic]; + } + + + + + [customArray addObject:model]; + } + + + + [self showMBProgressHUDWithString:@"正在保存" autoHidden:NO]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:jsonArray forKey:@"list"]; + + JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"UPHEALTH" NeedToken:@""]; + + [detailApi postBaseHealthInfoAPI :parmDic]; + +} + +- (NSString*)convertToJSONData:(id)infoDict +{ + NSError *error; + NSData *jsonData = [NSJSONSerialization dataWithJSONObject:infoDict + options:NSJSONWritingPrettyPrinted // Pass 0 if you don't care about the readability of the generated string + error:&error]; + + NSString *jsonString = @""; + + if (! jsonData) + { + }else + { + jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]; + } + + jsonString = [jsonString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; //去除掉首尾的空白字符和换行字符 + + [jsonString stringByReplacingOccurrencesOfString:@"\n" withString:@""]; + + return jsonString; +} + + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h new file mode 100644 index 0000000..c1e984d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.h @@ -0,0 +1,21 @@ +// +// XJDoctorMainViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/20. +// + +#import "HQBaseViewController.h" +#import "QuestionDiseaseInfoModel.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJDoctorMainViewController : HQBaseViewController + +@property (nonatomic, strong) QuestionDiseaseInfoModel * disModel; +@property (nonatomic, strong) NSString * yuyue_id; +@property (nonatomic, assign) NSInteger popType; // 1返回上一页 其他跳转向相应 + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m new file mode 100644 index 0000000..2e94e56 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m @@ -0,0 +1,733 @@ +// +// XJDoctorMainViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/20. +// + +#import "XJDoctorMainViewController.h" +#import "DoctorStatusView.h" +#import "DoctorInfoTopView.h" +#import "AppointmentInfoView.h" +#import "evaluationPopView.h" +#import "SelectedDoctorTimeVC.h" +#import "DoctorReportModel.h" +#import "LookModficalFileViewController.h" +#import "QuesstionDetailLookFileViewController.h" +#import "QuestionBodyReportModel.h" +#import "ExpertMainViewController.h" +#import "evaluationPopView.h" +#import "FSXBStarRateView.h" +#import "SelectedQuestionViewController.h" + +@interface XJDoctorMainViewController () + +@property (nonatomic, strong) DoctorReportDoctorInfoModel * doctorModel; +@property (nonatomic, strong) DoctorReportConSessionModel * sessionModel; +@property (nonatomic, strong) DoctorReportRecordsModel * danganModel; +@property (nonatomic, strong) DoctorInfoTopView * doctorInfoView; +@property (nonatomic, strong) AppointmentInfoView * AppointView; +@property (nonatomic, strong) UIScrollView * mainScrollview; +@property (nonatomic, copy) NSString * yueyue_id; +@property (nonatomic, strong) UIButton * bottomBtn; +@property (nonatomic, strong) UIButton * pingjiaBtn; +@property (nonatomic, strong) UIView * evaluateView; +@property (nonatomic, strong) NSMutableArray * topViewArray; +@property (nonatomic, strong) UILabel * evaluateLabel; +@property (nonatomic, strong) UILabel * evaluateNameLabel; +@property (nonatomic, strong) FSXBStarRateView * starRateView; + +@property (nonatomic, strong) evaluationPopView * popView; + + + +@end + +@implementation XJDoctorMainViewController + +- (NSMutableArray *)topViewArray { + + if (!_topViewArray) { + + _topViewArray = [[NSMutableArray alloc] init]; + } + return _topViewArray; +} + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.view.backgroundColor = UIColorHex(#EFEFEF); + + // 注册键盘通知 + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(keyboardWillShow:) + name:UIKeyboardWillShowNotification + object:nil]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(keyboardWillHide:) + name:UIKeyboardWillHideNotification + object:nil]; + // 启用侧滑返回手势 + self.navigationController.interactivePopGestureRecognizer.delegate = self; + self.navigationController.interactivePopGestureRecognizer.enabled = YES; + + // 创建自定义手势识别器 + UIScreenEdgePanGestureRecognizer *panGesture = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(handlePanGesture:)]; + panGesture.edges = UIRectEdgeLeft; + [self.view addGestureRecognizer:panGesture]; + self.isHidenNaviBar = YES; + [self createTopAndNav]; + [self createStatusView]; + [self createData]; +} + +- (void)createTopAndNav { + + UIView * navView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(222))]; + navView.backgroundColor = UIColorHex(#21BEBD); + [self.view addSubview:navView]; + UIButton * backBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(15), kStatusBarHeight + kRealValue(15), 30, 30)]; + [backBtn setImage:[UIImage imageNamed:@"whiteBack_icon"] forState:UIControlStateNormal]; + [backBtn addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; + [navView addSubview:backBtn]; +} + +- (void)backAction { + +// if (self.popType == 1) { +// [self.navigationController popViewControllerAnimated:YES]; +// }else +// { +//// int i = 0; +//// int allCount = self.navigationController.viewControllers.count; +//// for (UIViewController *controller in self.navigationController.viewControllers) +//// { +//// if ([controller isKindOfClass:[ExpertMainViewController class]]) { +//// ExpertMainViewController * expervc =(ExpertMainViewController *)controller; +//// [self.navigationController popToViewController:expervc animated:YES]; +//// } +//// if ([controller isKindOfClass:[OneKeyQuestionDetailVC class]]) { +//// OneKeyQuestionDetailVC * phyVC =(OneKeyQuestionDetailVC *)controller; +//// [self.navigationController popToViewController:phyVC animated:false]; +//// } +//// i++; +//// if (i == allCount && ![controller isKindOfClass:[ExpertMainViewController class]] && ![controller isKindOfClass:[OneKeyQuestionDetailVC class]] ) { +//// [self.navigationController popViewControllerAnimated:YES]; +//// } +//// +//// } +// // 获取导航堆栈视图控制器数组 +// NSArray *viewControllers = self.navigationController.viewControllers; +// +// // 确保堆栈中有足够的视图控制器 +// if (viewControllers.count >= 3) { +// // 返回到上上级视图控制器 +// UIViewController *targetViewController = viewControllers[viewControllers.count - 3]; +// [self.navigationController popToViewController:targetViewController animated:YES]; +// } else { +// // 处理视图控制器不足的情况，比如弹出提示或者直接 popToRootViewController +// [self.navigationController popViewControllerAnimated:YES]; +// } +// } + // 获取当前导航控制器的视图控制器堆栈 + NSArray *viewControllers = self.navigationController.viewControllers; + + // 查找导航堆栈中的目标视图控制器 + UIViewController *targetViewController = nil; + for (UIViewController *vc in viewControllers) { + if ([vc isKindOfClass:[SelectedQuestionViewController class]]) { + targetViewController = vc; + break; + } + } + + if (targetViewController) { + // 如果找到目标视图控制器，则弹出到该视图控制器 + [self.navigationController popToViewController:targetViewController animated:YES]; + } else { + // 如果没有找到目标视图控制器，则返回到上一页 + [self.navigationController popViewControllerAnimated:YES]; + } +} + +- (void)createStatusView { + NSArray * array = @[@" 待确认 ",@" 待开始 ",@"在线咨询",@" 待评价 ",@" 完成 "]; + CGFloat statusW = (kScreenWidth - kRealValue(68))/5; + for (int i = 0; i < 5 ; i ++) { + + DoctorStatusView * statusView = [[DoctorStatusView alloc] initWithFrame:CGRectMake(kRealValue(34) + (statusW + 5) * i , kTopHeight + kRealValue(5), statusW, kRealValue(50))]; + if (i == 0) { + statusView.isSelected = true; + }else + { + statusView.isSelected = false; + + } + statusView.lastType = 4; + + statusView.statusString = array[i]; + [self.topViewArray addObject:statusView]; + [self.view addSubview:statusView]; + } + + UILabel * titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(33), kTopHeight + kRealValue(11) + kRealValue(70) , kScreenWidth - kRealValue(66), 13)]; + titleLabel.text = @"预约成功后，请就诊当日打开APP等待医生呼叫"; + titleLabel.textColor = KWhiteColor; + titleLabel.font = MEDIUMFONT(12); + titleLabel.textAlignment = NSTextAlignmentLeft; + [self.view addSubview:titleLabel]; + + UIButton * bottomBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(31.5), kScreenHeight - 50 , self.view.width - kRealValue(66), 40)]; + [bottomBtn setTitle:@"取消预约" forState:UIControlStateNormal]; + [bottomBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; + bottomBtn.titleLabel.font = SYSTEMFONT(14); + bottomBtn.layer.cornerRadius = 20; + bottomBtn.layer.masksToBounds = true; + bottomBtn.layer.borderColor = UIColorHex(#21BEBD).CGColor; + [bottomBtn addTarget:self action:@selector(cancelAppointClick) forControlEvents:UIControlEventTouchUpInside]; + bottomBtn.layer.borderWidth = 1.0f; + self.bottomBtn = bottomBtn; + [self.view addSubview:bottomBtn]; + + self.pingjiaBtn = [[UIButton alloc] initWithFrame:CGRectMake(kRealValue(31.5), kScreenHeight - 50 , self.view.width - kRealValue(66), 40)]; + [self.pingjiaBtn setTitle:@"去评价" forState:UIControlStateNormal]; + [self.pingjiaBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; + self.pingjiaBtn.titleLabel.font = SYSTEMFONT(14); + self.pingjiaBtn.layer.cornerRadius = 20; + self.pingjiaBtn.layer.masksToBounds = true; + [self.pingjiaBtn addTarget:self action:@selector(qupingjiaAction) forControlEvents:UIControlEventTouchUpInside]; + self.pingjiaBtn.hidden = true; + self.pingjiaBtn.backgroundColor = UIColorHex(#21BEBD); + [self.view addSubview:self.pingjiaBtn]; + MJWeakSelf + UIScrollView * mainScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(kRealValue(15), titleLabel.bottom + kRealValue(27), kScreenWidth - kRealValue(30),kScreenHeight - titleLabel.bottom - 50 - 40)]; + mainScrollView.showsVerticalScrollIndicator = false; + mainScrollView.showsHorizontalScrollIndicator = false; + mainScrollView.backgroundColor = KClearColor; + self.mainScrollview = mainScrollView; + [self.view addSubview:mainScrollView]; + + DoctorInfoTopView * infoView = [[DoctorInfoTopView alloc] initWithFrame:CGRectMake(0, 0, mainScrollView.width, 210)]; + infoView.backgroundColor = KWhiteColor; + self.doctorInfoView = infoView; + infoView.height = infoView.doctorinfoHeight; + infoView.layer.cornerRadius = 5.0; + infoView.layer.masksToBounds = true; + infoView.collectBlock = ^(DoctorReportDoctorInfoModel * _Nonnull doctorModel) { + [weakSelf collectDoctor:doctorModel]; + }; + [mainScrollView addSubview:infoView]; + + + AppointmentInfoView * AppointView = [[AppointmentInfoView alloc] initWithFrame:CGRectMake(0, infoView.bottom + kRealValue(10), mainScrollView.width, 400)]; + AppointView.backgroundColor = KWhiteColor; + self.AppointView = AppointView; + + AppointView.lookBlock = ^{ + [weakSelf lookFileDeatil]; + }; + + [HQCommonUtils addShadowToView:AppointView]; + AppointView.height = AppointView.infoH; + [mainScrollView addSubview:AppointView]; + + self.evaluateView = [[UIView alloc] initWithFrame:CGRectMake(0, AppointView.bottom + kRealValue(10), mainScrollView.width, 50)]; + self.evaluateView.backgroundColor = KWhiteColor; + self.evaluateView.layer.cornerRadius = 10; + self.evaluateView.layer.masksToBounds = true; + self.evaluateView.hidden = true; + [mainScrollView addSubview:self.evaluateView]; + + self.evaluateNameLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15), kRealValue(15), 100, 15)]; + self.evaluateNameLabel.textColor = CFontColor1; + self.evaluateNameLabel.textAlignment = NSTextAlignmentLeft; + self.evaluateNameLabel.font = BOLDSYSTEMFONT(14); + self.evaluateNameLabel.text = @"--"; + + [self.evaluateView addSubview:self.evaluateNameLabel]; + + self.starRateView = [[FSXBStarRateView alloc] initWithFrame:CGRectMake(self.evaluateNameLabel.right, kRealValue(13), 100, 15) numberOfStars:5 rateStyle:HalfStar isAnination:YES finish:^(CGFloat currentScore) { + }]; + self.starRateView.enable = false; + self.starRateView.currentScore = 3; + [self.evaluateView addSubview:self.starRateView]; + + self.evaluateLabel = [[UILabel alloc] initWithFrame:CGRectMake(kRealValue(15),self.evaluateNameLabel.bottom + kRealValue(15), self.evaluateView.width - kRealValue(30), 15)]; + self.evaluateLabel.textColor = CFontColor2; + self.evaluateLabel.textAlignment = NSTextAlignmentLeft; + self.evaluateLabel.font = SYSTEMFONT(12); + self.evaluateLabel.text = @"--"; + [self.evaluateView addSubview:self.evaluateLabel]; + + + + mainScrollView.contentSize = CGSizeMake(kScreenWidth - kRealValue(30), kScreenHeight - titleLabel.bottom - 50 - 40); + + + +} + +- (void)createData { + + [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:NO]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:self.yuyue_id forKey:@"id"]; + + JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"ReportApi" NeedToken:@""]; + + [detailApi getAppointmentReportDetailAPI:parmDic]; +} + + +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"ReportApi"]) { + + [self hiddenAllMBProgressHUD]; + NSDictionary * resDic = response; + DoctorReportModel * model = [DoctorReportModel modelWithDictionary:resDic]; + + self.sessionModel = [DoctorReportConSessionModel modelWithDictionary:model.conSession] ; + self.doctorModel = [DoctorReportDoctorInfoModel modelWithDictionary:model.conDoctorDO] ; + self.danganModel = [DoctorReportRecordsModel modelWithDictionary:model.conMedicalRecordsListDO]; +// 预约状态 1待确认 2待开始 3已开始 4待评价 5已完成 6 拒绝 7取消 8 超时 + [self topStatus:[self.sessionModel.contentStatus intValue]]; + self.doctorInfoView.model = model; + +// self.AppointView.recordModel = [DoctorReportRecordsModel modelWithDictionary:model.conMedicalRecordsListDO] ; +// self.AppointView.familyModel = [DoctorReportFamilyInfoModel modelWithDictionary:model.conFamilyMembersDO]; +// self.AppointView.answerModel = model; + self.AppointView.model = model; + if ([self.sessionModel.contentStatus intValue] == 7) { + self.AppointView.isQuxiao = true; + self.bottomBtn.hidden = true; + } + if ([self.sessionModel.contentStatus intValue] == 6) { + self.AppointView.isQuxiao = false; + self.bottomBtn.hidden = true; + } + if ([self.sessionModel.contentStatus intValue] == 4) { + + self.pingjiaBtn.hidden = false; + } + if ([self.sessionModel.contentStatus intValue] == 5) { + + self.pingjiaBtn.hidden = true; + self.bottomBtn.hidden = true; + self.evaluateView.hidden = false; + DoctorConEvaluateDOModel * evModel = [DoctorConEvaluateDOModel modelWithDictionary:model.conEvaluateDO] ; + self.evaluateLabel.text = evModel.context; + self.evaluateNameLabel.text = evModel.userName; + self.starRateView.currentScore = [evModel.score floatValue]; + + self.evaluateNameLabel.width = [HQCommonUtils getLengthFromText:self.evaluateNameLabel.text andFontSize:16]; + self.starRateView.left = self.evaluateNameLabel.right + kRealValue(10); + self.evaluateLabel.height = [HQCommonUtils getSpaceLabelHeight:self.evaluateLabel withStr:self.evaluateLabel.text withFont:[UIFont systemFontOfSize:12 weight:UIFontWeightMedium] withWidth:self.evaluateLabel.width withLineSpacing:5]; + self.evaluateView.height = self.evaluateLabel.bottom + kRealValue(10); + + } + if ([self.sessionModel.contentStatus intValue] == 1 || [self.sessionModel.contentStatus intValue] == 2 || [self.sessionModel.contentStatus intValue] == 3) + { + self.AppointView.isQuxiao = false; + } + //布局 + self.doctorInfoView.height = self.doctorInfoView.doctorinfoHeight; + self.AppointView.top = self.doctorInfoView.bottom + 10; + self.AppointView.height = self.AppointView.infoH; + self.evaluateView.top = self.AppointView.bottom + 10; + self.AppointView.height = self.AppointView.infoH; + self.evaluateView.top = self.AppointView.bottom + 10; + self.mainScrollview.contentSize = CGSizeMake(kScreenWidth - kRealValue(30), self.evaluateView.bottom); +// //是否体检报告 +// if ([self.danganModel.tfPermission integerValue] == 1) { //有体检报告 +// +// [self getBodyInfoReport:model.idNo]; +// +// }else +// { +// +// } + } + + if ([tag isEqualToString:@"CARDSEARCH"]) { + + [self hiddenAllMBProgressHUD]; +// NSDictionary * dic = response; +// +// if ([dic.allKeys containsObject:@"records"]) { +// int i = 0; +// NSArray * array = [dic objectForKey:@"records"]; +// for (NSDictionary * parm in array) { +// +// PhyscialReportListModel * model = [PhyscialReportListModel modelWithDictionary:parm]; +// +// if (i == 0) { +// self.AppointView.bodyModel =model; +// } +// i++; +// } +// if (array.count <= 0) { +// self.AppointView.bodyModel = nil; +// } +// self.AppointView.height = self.AppointView.infoH; +// self.evaluateView.top = self.AppointView.bottom + 10; +// self.mainScrollview.contentSize = CGSizeMake(kScreenWidth - kRealValue(30), self.evaluateView.bottom); +// +// } +// + } + + if ([tag isEqualToString:@"CANCELQUESTION"]) { + [self hiddenAllMBProgressHUD]; + [self createData]; + } + if ([tag isEqualToString:@"CollAPI"]) { + [self hiddenAllMBProgressHUD]; + + [EasyTextView showSuccessText:response]; + [self createData]; + } + if ([tag isEqualToString:@"cancelAPI"]) { + [self hiddenAllMBProgressHUD]; + + [EasyTextView showSuccessText:response]; + [self createData]; + + } + if ([tag isEqualToString:@"DoctorSource"]) { + [self hiddenAllMBProgressHUD]; + [self.popView removeFromSuperview]; + [self createData]; + } +} + +- (void)collectDoctor:(DoctorReportDoctorInfoModel *)doctorModel { + + + if([doctorModel.tfFollow integerValue] == 1) { //已经关注 点击取消 + + + [self showMBProgressHUDWithString:@"正在取消关注" autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:doctorModel.doctor_id forKey:@"doctorId"]; + + JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"cancelAPI" NeedToken:@""]; + + [detailApi getCancelCollectDoctorExpertData:parmDic]; + + } +else + { + [self showMBProgressHUDWithString:@"正在关注" autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:doctorModel.doctor_id forKey:@"doctorId"]; + + JKCQAPI * detailApi = [[JKCQAPI alloc] init:self tag:@"CollAPI" NeedToken:@""]; + + [detailApi getCollectDoctorExpertData:parmDic]; + + } + + +} + +//请求体检信息 +- (void)getBodyInfoReport:(NSString *)byID { + +// NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; +// +// [parmDic setObject:User_ID forKey:@"userId"]; +// +// JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"CARDSEARCH" NeedToken:nil]; +// +// [api GetPhyscialIDCardSearch:parmDic]; + +} + +- (void)topStatus:(int)status { + //预约状态 1待确认 2待开始 3已开始 4待评价 5已完成 + // 6 拒绝 7取消 8 超时 + + if(status == 1 || status == 6 ) { + + int i = 0; + for (DoctorStatusView * topView in self.topViewArray) { + if ( i == 0) { + topView.isSelected = true; + }else + { + topView.isSelected = false; + } + topView.lastType = i ; + i ++; + } + } + if(status == 2) { + + int i = 0; + for (DoctorStatusView * topView in self.topViewArray) { + if ( i == 1) { + + topView.isSelected = true; + }else + { + topView.isSelected = false; + } + topView.lastType = i ; + + i ++; + } + } + if(status == 3) { + + int i = 0; + for (DoctorStatusView * topView in self.topViewArray) { + if ( i == 2) { + + topView.isSelected = true; + }else + { + topView.isSelected = false; + } + i ++; + } + } + if(status == 4) { + + int i = 0; + for (DoctorStatusView * topView in self.topViewArray) { + if ( i == 3) { + + topView.isSelected = true; + }else + { + topView.isSelected = false; + } + topView.lastType = i ; + + i ++; + } + } + + if(status == 5) { + + int i = 0; + for (DoctorStatusView * topView in self.topViewArray) { + if ( i == 4) { + + topView.isSelected = true; + }else + { + topView.isSelected = false; + } + topView.lastType = i ; + + i ++; + } + } + // 6 拒绝 7取消 8 超时 + if(status == 7) + { + int i = 0; + for (DoctorStatusView * topView in self.topViewArray) { + if ( i == 1) { + topView.statusString = @"取消预约"; + topView.isSelected = true; + }else + { + topView.isSelected = false; + } + topView.lastType = i ; + + i ++; + } + } + + if(status == 8 ) + { + DoctorStatusView * topView = self.topViewArray.lastObject; + topView.isSelected = true; + } + DoctorStatusView * lastView = self.topViewArray.lastObject; + lastView.lastType = 4; + +} + +#pragma mark:查看档案详情 + +- (void)lookFileDeatil { + +#pragma mark - 网络请求 + + +// NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; +// +// [parmDic setObject:self.danganModel.dangan_id forKey:@"id"]; +// +// JKCQAPI * upApi = [[JKCQAPI alloc] init:self tag:@"FILEDATA" NeedToken:@""]; +// +// [upApi GetLookModficalMemberShipFileData:parmDic]; +// + QuesstionDetailLookFileViewController * detailvc = [[QuesstionDetailLookFileViewController alloc] init]; + detailvc.danganID = self.danganModel.dangan_id; + [self.navigationController pushViewController:detailvc animated:YES]; +} + +#pragma mark:查看体检报告 + +- (void)lookReportDeatil { + +// PhysicalReportViewController * phyVC = [[PhysicalReportViewController alloc] init]; +// [self.navigationController pushViewController:phyVC animated:YES]; +// PhyReportDetailViewController * yearVC = [[PhyReportDetailViewController alloc] init]; +// yearVC.navTitle = model.medicalYear; +// yearVC.yearString = model.report_id; +// [self.navigationController pushViewController:yearVC animated:YES]; + +} + +#pragma mark:取消预约 + +- (void)cancelAppointClick { + +// GET http://cqyt.dev.yg.dt.io/health-consultation/api/consult/conSession/cancelSession?id=1716737797670907906 HTTP/1.1 + +// evaluationPopView * popView = [[evaluationPopView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; +// popView.popBlock = ^(CGFloat starNumber, BOOL isSecrect, NSString * _Nonnull evaluationString) { +// [EasyTextView showInfoText:@"点击了提交"]; +// }; +// [[UIApplication sharedApplication].keyWindow addSubview:popView]; + +// GET http://cqyt.dev.yg.dt.io/health-consultation/api/consult/conDoctorSchedulingDate/selectSchedulingDateListByDoctorId?doctorId=1539253293e421ab0115425351860001 HTTP/1.1 +// QuesstionDetailLookFileViewController * lookVC = [[QuesstionDetailLookFileViewController alloc] init]; +// +// lookVC.danganID = self.danganModel.dangan_id; +// +// [self.navigationController pushViewController:lookVC animated:YES]; + [self showMBProgressHUDWithString:@"正在取消..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:self.sessionModel.yuyue_id forKey:@"id"]; + + JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"CANCELQUESTION" NeedToken:nil]; + + [api getCancelQuestion:parmDic]; + +} + +- (void)qupingjiaAction { + + evaluationPopView * popView = [[evaluationPopView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; + self.popView = popView; + popView.popBlock = ^(CGFloat starNumber, BOOL isSecrect, NSString * _Nonnull evaluationString) { + NSString * niming = isSecrect == YES? @"1":@"0"; + [self doctorSourceWithStarNumaber:starNumber withContext:evaluationString isKnow:niming]; + }; + [[UIApplication sharedApplication].keyWindow addSubview:popView]; + +} + +- (void)doctorSourceWithStarNumaber:(CGFloat)starNumer withContext:(NSString *)connet isKnow:(NSString *)isNiming{ + + [self showMBProgressHUDWithString:@"评价中,请稍候..." autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(starNumer) forKey:@"score"]; + [parmDic setObject:connet forKey:@"context"]; + [parmDic setObject:self.sessionModel.yuyue_id forKey:@"sessionId"]; + [parmDic setObject:isNiming forKey:@"tfUnknow"]; + + JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"DoctorSource" NeedToken:@""]; + [endApi PostQustionDoctorScore:parmDic]; + +} + + +- (void)keyboardWillShow:(NSNotification *)notification { + // 获取键盘的大小和动画持续时间 + NSDictionary *userInfo = [notification userInfo]; + CGRect keyboardFrame = [[userInfo objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; + double duration = [[userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]; + + // 根据键盘的大小调整视图的位置 + [UIView animateWithDuration:duration animations:^{ + // 您可以在这里调整视图的位置，例如： + self.popView.frame = CGRectMake(0, self.view.bounds.size.height - keyboardFrame.size.height - self.popView.bounds.size.height, self.popView.bounds.size.width, self.popView.bounds.size.height); + }]; +} + +- (void)keyboardWillHide:(NSNotification *)notification { + // 获取动画持续时间 + NSDictionary *userInfo = [notification userInfo]; + double duration = [[userInfo objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]; + + // 恢复视图的位置 + [UIView animateWithDuration:duration animations:^{ + // 恢复视图到原来的位置，例如： + self.popView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight); // originalFrame 是视图原来的位置 + }]; +} + + + +- (void)dealloc { + // 移除通知 + [[NSNotificationCenter defaultCenter] removeObserver:self + name:UIKeyboardWillShowNotification + object:nil]; + + [[NSNotificationCenter defaultCenter] removeObserver:self + name:UIKeyboardWillHideNotification + object:nil]; +} +// 手势处理方法 +- (void)handlePanGesture:(UIScreenEdgePanGestureRecognizer *)gesture { + if (gesture.state == UIGestureRecognizerStateEnded) { + NSArray *viewControllers = self.navigationController.viewControllers; + UIViewController *targetViewController = nil; + + // 查找导航堆栈中的目标视图控制器 + for (UIViewController *vc in viewControllers) { + if ([vc isKindOfClass:[SelectedQuestionViewController class]]) { + targetViewController = vc; + break; + } + } + if (targetViewController) { + // 如果找到目标视图控制器，则弹出到该视图控制器 + [self.navigationController popToViewController:targetViewController animated:YES]; + } else { + // 如果没有找到目标视图控制器，则返回到上一页 + [self.navigationController popViewControllerAnimated:YES]; + } + } +} + +// UIGestureRecognizerDelegate 方法 +- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer { + // 确保只有在不是根视图控制器时才启用手势 + return self.navigationController.viewControllers.count > 1; +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.h index 8da747d..ee4c59c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.h @@ -1,6 +1,6 @@ // // DoctorDetailModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.m index 1f4e27e..31b5df9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorDetailModel.m @@ -1,6 +1,6 @@ // // DoctorDetailModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.h index 0ce85b0..988b488 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.h @@ -1,6 +1,6 @@ // // DoctorRecommendModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.m index 0f83016..b72d792 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorRecommendModel.m @@ -1,6 +1,6 @@ // // DoctorRecommendModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.h index 8f3a361..6e6b6cf 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.h @@ -1,6 +1,6 @@ // // DoctorReportModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.m index a9955e2..14c2058 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorReportModel.m @@ -1,6 +1,6 @@ // // DoctorReportModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.h index 005daee..7742488 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.h @@ -1,6 +1,6 @@ // // DoctorTimeModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.m index 8a4e844..afbbcb1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/DoctorTimeModel.m @@ -1,6 +1,6 @@ // // DoctorTimeModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.h index 5424697..fc4d0d4 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.h @@ -1,6 +1,6 @@ // // EvaluatListModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.m index 9611ed4..e49515c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/EvaluatListModel.m @@ -1,6 +1,6 @@ // // EvaluatListModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.h index 107a83f..5bc51df 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.h @@ -1,6 +1,6 @@ // // FamilyMemberRelationModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.m index 58d9889..7048ffd 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FamilyMemberRelationModel.m @@ -1,6 +1,6 @@ // // FamilyMemberRelationModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.h index 66d96ea..a19228c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.h @@ -1,6 +1,6 @@ // // FileDataModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.m index 0cffd92..7dd296e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FileDataModel.m @@ -1,6 +1,6 @@ // // FileDataModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.h index d2bdfbb..a89e44d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.h @@ -1,6 +1,6 @@ // // FoundExpertModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.m index a48008e..1594ad4 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/FoundExpertModel.m @@ -1,6 +1,6 @@ // // FoundExpertModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.h index 2e4a36c..fd8fc15 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.h @@ -1,6 +1,6 @@ // // HospitalInfoModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.m index 66d512b..b2d8bb0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/HospitalInfoModel.m @@ -1,6 +1,6 @@ // // HospitalInfoModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.h index 075cc7b..34e4276 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.h @@ -1,6 +1,6 @@ // // LookFileDataModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/27. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.m index 01e0bc4..b1c5021 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/LookFileDataModel.m @@ -1,6 +1,6 @@ // // LookFileDataModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/27. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.h index 40d69ba..ef4e982 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.h @@ -1,6 +1,6 @@ // // QuestionBodyReportModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.m index 1c6fc58..e413764 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionBodyReportModel.m @@ -1,6 +1,6 @@ // // QuestionBodyReportModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.h index 695af6a..511655a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.h @@ -1,6 +1,6 @@ // // QuestionDiseaseInfoModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/17. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.m index ba740de..696d410 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionDiseaseInfoModel.m @@ -1,6 +1,6 @@ // // QuestionDiseaseInfoModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/17. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.h index 7810ae8..1658ff6 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.h @@ -1,6 +1,6 @@ // // QuestionItemModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.m index da357a8..5ba324b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionItemModel.m @@ -1,6 +1,6 @@ // // QuestionItemModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.h index 5b103a7..ca80fbd 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.h @@ -1,6 +1,6 @@ // // QuestionOptionModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.m index d5e45e2..8f0864a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionOptionModel.m @@ -1,6 +1,6 @@ // // QuestionOptionModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.h index 995c519..5f31cf1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.h @@ -1,6 +1,6 @@ // // QuestionPeopleModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.m index 29da842..41e237e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionPeopleModel.m @@ -1,6 +1,6 @@ // // QuestionPeopleModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.h index 782ff4d..3073507 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.h @@ -1,6 +1,6 @@ // // QuestionRecordModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.m index afa6586..0e22367 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/QuestionRecordModel.m @@ -1,6 +1,6 @@ // // QuestionRecordModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.h index d2b4003..308ea9f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.h @@ -1,6 +1,6 @@ // // RecordIMListDateModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/23. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.m index ec88848..0eeca02 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/RecordIMListDateModel.m @@ -1,6 +1,6 @@ // // RecordIMListDateModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/23. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.h index 8a815d9..a9d1e86 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.h @@ -1,6 +1,6 @@ // // SOSGroupIMModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/4. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.m index b2135f1..317944d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SOSGroupIMModel.m @@ -1,6 +1,6 @@ // // SOSGroupIMModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/4. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.h index 991f83b..438c8c9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.h @@ -1,6 +1,6 @@ // // SearchRoomModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.m index 6dc650f..a17cb08 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchRoomModel.m @@ -1,6 +1,6 @@ // // SearchRoomModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.h index a4cb75b..c3fe59a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.h @@ -1,6 +1,6 @@ // // SearchSicksModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.m index 44dd93c..25ea992 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SearchSicksModel.m @@ -1,6 +1,6 @@ // // SearchSicksModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/12. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.h index 2ee21a5..134d89e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.h @@ -1,6 +1,6 @@ // // SmallHelpIMDataModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/24. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.m index bcdd622..f70931e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Model/SmallHelpIMDataModel.m @@ -1,6 +1,6 @@ // // SmallHelpIMDataModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/24. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h index cbd93f2..bd48a74 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.h @@ -1,6 +1,6 @@ // // ADJumpViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/6. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.m index a196b73..36600b4 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/ADJumpViewController.m @@ -1,6 +1,6 @@ // // ADJumpViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/6. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.h index 2108b6c..5d1a102 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.h @@ -1,6 +1,6 @@ // // HQSearchView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.m index 68f728c..57cea84 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HQSearchView.m @@ -1,6 +1,6 @@ // // HQSearchView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.h index bdb729c..3e8cf15 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.h @@ -1,6 +1,6 @@ // // HealthPhyReportModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.m index 294a636..2e911d3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportModel.m @@ -1,6 +1,6 @@ // // HealthPhyReportModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.h index 66e3d3a..2f4969d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.h @@ -1,6 +1,6 @@ // // HealthPhyReportTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.m index ce37494..b1e3600 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthPhyReportTableView.m @@ -1,6 +1,6 @@ // // HealthPhyReportTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.h index 4c7b6c6..6dfd604 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.h @@ -1,6 +1,6 @@ // // HealthSugReportTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.m index dc27775..97867a7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/HealthSugReportTableViewCell.m @@ -1,6 +1,6 @@ // // HealthSugReportTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h index fc77983..872c0d8 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.h @@ -1,6 +1,6 @@ // // LookReportImageViewController.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/2/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.m index ed3f4ca..a241c7a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/LookReportImageViewController.m @@ -1,6 +1,6 @@ // // LookReportImageViewController.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/2/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.h index 3dc5836..d9ef462 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.h @@ -1,6 +1,6 @@ // // SickNameSubTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.m index 4da9430..ea44559 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameSubTableViewCell.m @@ -1,6 +1,6 @@ // // SickNameSubTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.h index 4161780..494fc57 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.h @@ -1,6 +1,6 @@ // // SickNameTopTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.m index 992c08b..1e1e803 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/SickNameTopTableViewCell.m @@ -1,6 +1,6 @@ // // SickNameTopTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/8/29. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.h index 4b64a86..ebc9b69 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.h @@ -1,6 +1,6 @@ // // imageReportTableViewCell.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/2/23. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.m index 7ef1794..9f58378 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/OtherFile/imageReportTableViewCell.m @@ -1,6 +1,6 @@ // // imageReportTableViewCell.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/2/23. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.h index 61b465e..513261a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.h @@ -1,6 +1,6 @@ // // AppointmentInfoView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.m index d2bf2da..d061242 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/AppointmentInfoView.m @@ -1,6 +1,6 @@ // // AppointmentInfoView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.h index a1c8e1e..ad1030f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.h @@ -1,6 +1,6 @@ // // AllHospitalConditionView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.m index e5e5627..4824006 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllHospitalConditionView.m @@ -1,6 +1,6 @@ // // AllHospitalConditionView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.h index 67a6ab2..b4d19b7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.h @@ -1,6 +1,6 @@ // // AllRoomsConditionView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.m index 3ed12f2..2b86bf2 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllRoomsConditionView.m @@ -1,6 +1,6 @@ // // AllRoomsConditionView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.h index 97079a7..b8cdb05 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.h @@ -1,6 +1,6 @@ // // AllSicksConditionView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.m index b8c0664..ee87fe0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/ConditionsView(条件筛选)/AllSicksConditionView.m @@ -1,6 +1,6 @@ // // AllSicksConditionView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/13. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.h index 148cacf..52b389a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.h @@ -1,6 +1,6 @@ // // HQPhotoCollectView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.m index bafe02b..eabd4e3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoCollectView.m @@ -1,6 +1,6 @@ // // HQPhotoCollectView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.h index 4c522a4..9d5a04c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.h @@ -1,6 +1,6 @@ // // HQPhotoPostCollectionViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.m index 8b84803..fe81a79 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/HQPhotoPostCollectionViewCell.m @@ -1,6 +1,6 @@ // // HQPhotoPostCollectionViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.h index 4ff485b..0ca62d0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.h @@ -1,6 +1,6 @@ // // QuestionItemTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.m index 3d53309..d2a4d06 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTable.m @@ -1,6 +1,6 @@ // // QuestionItemTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.h index fba3520..b0214f7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.h @@ -1,6 +1,6 @@ // // QuestionItemTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.m index a46e0f6..7bdc9b9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/QuestionItemTableViewCell.m @@ -1,6 +1,6 @@ // // QuestionItemTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.h index 3ec7ce9..08755d9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.h @@ -1,6 +1,6 @@ // // SelectedFileDateCenterView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.m index 9f39fe4..931b169 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DataDetail(档案详情)/SelectedFileDateCenterView.m @@ -1,6 +1,6 @@ // // SelectedFileDateCenterView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.h index e516882..8b83cbf 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.h @@ -1,6 +1,6 @@ // // DoctorEvaluationTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.m index 53f38b7..782ea3a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTable.m @@ -1,6 +1,6 @@ // // DoctorEvaluationTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.h index 7ed6402..491def5 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.h @@ -1,6 +1,6 @@ // // DoctorEvaluationTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.m index 35d94d0..3cbe5be 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorEvaluationTableViewCell.m @@ -1,6 +1,6 @@ // // DoctorEvaluationTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/16. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.h index 02652d7..a02f1d6 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.h @@ -1,6 +1,6 @@ // // DoctorInfoTopView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m index 83bed1e..5ca1b7e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m @@ -1,6 +1,6 @@ // // DoctorInfoTopView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.h index 8d18fb4..b695988 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.h @@ -1,6 +1,6 @@ // // DoctorRoomCollectionView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.m index edd9d6a..a13b834 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionView.m @@ -1,6 +1,6 @@ // // DoctorRoomCollectionView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.h index 0380371..0dea649 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.h @@ -1,6 +1,6 @@ // // DoctorRoomCollectionViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.m index 0e51de6..cf9ada7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorRoomCollectionViewCell.m @@ -1,6 +1,6 @@ // // DoctorRoomCollectionViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.h index b66d1b4..ded2f2d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.h @@ -1,6 +1,6 @@ // // DoctorSelectTimeCollectionCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.m index 97ed870..82dacc3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorSelectTimeCollectionCell.m @@ -1,6 +1,6 @@ // // DoctorSelectTimeCollectionCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.h index 8a5a723..b7814ff 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.h @@ -1,6 +1,6 @@ // // DoctorStatusView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.m index a662cef..3c392e9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorStatusView.m @@ -1,6 +1,6 @@ // // DoctorStatusView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.h index cb15f78..1b4ad5a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.h @@ -1,6 +1,6 @@ // // DoctorTimeSelectedCollectView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.m index 218674d..5e3914d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorTimeSelectedCollectView.m @@ -1,6 +1,6 @@ // // DoctorTimeSelectedCollectView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.h index 0776e66..d9874b3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.h @@ -1,6 +1,6 @@ // // EvaluationListTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.m index a0c73f8..5919917 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/EvaluationListTableView.m @@ -1,6 +1,6 @@ // // EvaluationListTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.h index d1689e4..06c4839 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.h @@ -1,6 +1,6 @@ // // FoundExpertSubCollection.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.m index 76def83..e507939 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollection.m @@ -1,6 +1,6 @@ // // FoundExpertSubCollection.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.h index d0bc1bf..58affa3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.h @@ -1,6 +1,6 @@ // // FoundExpertSubCollectionViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.m index c00f5a2..3809440 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundExpertSubCollectionViewCell.m @@ -1,6 +1,6 @@ // // FoundExpertSubCollectionViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.h index 290df57..b5fe855 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.h @@ -1,6 +1,6 @@ // // FoundLeftTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.m index 042e756..0c71e8d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundLeftTableView.m @@ -1,6 +1,6 @@ // // FoundLeftTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.h index 3268626..4eb0ca9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.h @@ -1,6 +1,6 @@ // // FoundRightTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.m index b4df4bb..411fb89 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRightTableView.m @@ -1,6 +1,6 @@ // // FoundRightTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.h index 2ba6ead..6731267 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.h @@ -1,6 +1,6 @@ // // FoundRoomsTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.m index f576032..41fcc34 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/FoundRoomsTableViewCell.m @@ -1,6 +1,6 @@ // // FoundRoomsTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/19. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.h index de69cf3..73e788e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.h @@ -1,6 +1,6 @@ // // HealthyDoctorTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.m index 38b54a0..75af621 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyDoctorTableViewCell.m @@ -1,6 +1,6 @@ // // HealthyDoctorTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.h index ad7f6c1..fa4881c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.h @@ -1,6 +1,6 @@ // // HealthyQuestionHeardView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m index c9640ab..044e90d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m @@ -1,6 +1,6 @@ // // HealthyQuestionHeardView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.h index 9bed3d1..9fbad43 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.h @@ -1,6 +1,6 @@ // // HealthyQuestionTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.m index ec4c31d..8848a73 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionTable.m @@ -1,6 +1,6 @@ // // HealthyQuestionTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.h index a46268d..cdd0d12 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.h @@ -1,6 +1,6 @@ // // HealthyToolsView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.m index 7bfa93e..5b31dba 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyToolsView.m @@ -1,6 +1,6 @@ // // HealthyToolsView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.h index 4eaea61..9fd80de 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.h @@ -1,6 +1,6 @@ // // HospitalListTableCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.m index c5396af..7c6ce7f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalListTableCell.m @@ -1,6 +1,6 @@ // // HospitalListTableCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.h index 34c5283..9dd511f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.h @@ -1,6 +1,6 @@ // // EvaluationTiitleTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.m index 50d451f..1caf3b7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTiitleTableViewCell.m @@ -1,6 +1,6 @@ // // EvaluationTiitleTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.h index fd4f53a..1cbcbe3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.h @@ -1,6 +1,6 @@ // // EvaluationTitleTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.m index 83b6b34..8b81d95 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/EvaluationTitleTableViewCell.m @@ -1,6 +1,6 @@ // // EvaluationTitleTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.h index 80895f7..dc299ed 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.h @@ -1,6 +1,6 @@ // // HospatilDoctorCollectionViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.m index 3cce6be..cd150ee 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilDoctorCollectionViewCell.m @@ -1,6 +1,6 @@ // // HospatilDoctorCollectionViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.h index db82c77..116ab7d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.h @@ -1,6 +1,6 @@ // // HospatilIntroduceTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.m index f762728..d5764d1 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospatilIntroduceTableViewCell.m @@ -1,6 +1,6 @@ // // HospatilIntroduceTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.h index 148a986..77ea874 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.h @@ -1,6 +1,6 @@ // // HospitalEvaluationTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.m index cff8c33..d369ee9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalEvaluationTableViewCell.m @@ -1,6 +1,6 @@ // // HospitalEvaluationTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.h index a9554d4..e617389 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.h @@ -1,6 +1,6 @@ // // HospitalLocationTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.m index 99d55c7..1e0aa14 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalLocationTableViewCell.m @@ -1,6 +1,6 @@ // // HospitalLocationTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.h index f53dbe4..e36ff0f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.h @@ -1,6 +1,6 @@ // // HospitalMainDoctorCollectView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.m index 3195bd2..168c623 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainDoctorCollectView.m @@ -1,6 +1,6 @@ // // HospitalMainDoctorCollectView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/1. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.h index b91b3a5..77b6f02 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.h @@ -1,6 +1,6 @@ // // HospitalMainHeardView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.m index e645ef6..6f52522 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainHeardView.m @@ -1,6 +1,6 @@ // // HospitalMainHeardView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.h index bf61adf..89c2a7b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.h @@ -1,6 +1,6 @@ // // HospitalMainTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.m index ec2b14e..a1e5ca2 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HospitalMain/HospitalMainTableView.m @@ -1,6 +1,6 @@ // // HospitalMainTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/9. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.h index 10f3df6..79181ce 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.h @@ -1,6 +1,6 @@ // // MainSearchExpertTableCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.m index d41a2db..9028bad 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchExpertTableCell.m @@ -1,6 +1,6 @@ // // MainSearchExpertTableCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.h index 094923b..4006504 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.h @@ -1,6 +1,6 @@ // // MainSearchTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.m index 3bdcf2a..f98d32c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/MainSearchTable.m @@ -1,6 +1,6 @@ // // MainSearchTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.h index 6e39f03..6e76cac 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.h @@ -1,6 +1,6 @@ // // SearchConetShowTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.m index 5937741..efd0f41 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchConetShowTable.m @@ -1,6 +1,6 @@ // // SearchConetShowTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.h index bbf0d18..0a63d07 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.h @@ -1,6 +1,6 @@ // // SearchShowUpTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.m index 7d49a38..f5d9ba2 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchShowUpTableViewCell.m @@ -1,6 +1,6 @@ // // SearchShowUpTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.h index 7962bd0..63b1bba 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.h @@ -1,6 +1,6 @@ // // SearchZhuangjiaTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.m index 2b81cb3..addbd5c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/SearchZhuangjiaTable.m @@ -1,6 +1,6 @@ // // SearchZhuangjiaTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/5/26. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.h index b4df2ea..6cc794b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.h @@ -1,6 +1,6 @@ // // ZongheZhuangjiaTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.m index 5bda6b0..ba34b93 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/MainSearchView/ZongheZhuangjiaTableViewCell.m @@ -1,6 +1,6 @@ // // ZongheZhuangjiaTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.h index 06348d7..5daed2c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.h @@ -1,6 +1,6 @@ // // QuestionAddPeopleTableCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/17. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.m index 3c0fb71..edcde78 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionAddPeopleTableCell.m @@ -1,6 +1,6 @@ // // QuestionAddPeopleTableCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/17. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.h index 2f2aec3..f70be3b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.h @@ -1,6 +1,6 @@ // // QuestionDiseaseTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.m index 6d4ef29..1aadcf7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableView.m @@ -1,6 +1,6 @@ // // QuestionDiseaseTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.h index 67b02dd..e22eb81 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.h @@ -1,6 +1,6 @@ // // QuestionDiseaseTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m index b768a25..71162c0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m @@ -1,6 +1,6 @@ // // QuestionDiseaseTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.h index a30b39d..92b2d9b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.h @@ -1,6 +1,6 @@ // // QuestionPeopleManagerTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.m index 56ff8b9..553b2de 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTable.m @@ -1,6 +1,6 @@ // // QuestionPeopleManagerTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.h index edaa9d6..183e2c9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.h @@ -1,6 +1,6 @@ // // QuestionPeopleManagerTableCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.m index f044f32..ef68c66 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionPeopleManagerTableCell.m @@ -1,6 +1,6 @@ // // QuestionPeopleManagerTableCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.h index 359c912..14a0970 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.h @@ -1,6 +1,6 @@ // // QuestionRecordTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.m index fbd47f7..5969325 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecordTableViewCell.m @@ -1,6 +1,6 @@ // // QuestionRecordTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.h index 0e33b9c..b42a3e3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.h @@ -1,6 +1,6 @@ // // QuestionRecoredTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.m index 22fe184..dc7097f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionRecordView(咨询view)/QuestionRecoredTable.m @@ -1,6 +1,6 @@ // // QuestionRecoredTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/28. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.h index fd2a2a3..04ffbc2 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.h @@ -1,6 +1,6 @@ // // SelectedQuestionFirstTableCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.m index 4c0475f..2d2e0c7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionFirstTableCell.m @@ -1,6 +1,6 @@ // // SelectedQuestionFirstTableCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.h index df84af3..8da0d5e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.h @@ -1,6 +1,6 @@ // // SelectedQuestionTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.m index da433e1..d10580f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTableView.m @@ -1,6 +1,6 @@ // // SelectedQuestionTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.h index 781b531..29c9b0c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.h @@ -1,6 +1,6 @@ // // SelectedQuestionTypeTableCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.m index d23b9e1..3d4f81d 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/SelectedQuestionTypeTableCell.m @@ -1,6 +1,6 @@ // // SelectedQuestionTypeTableCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/14. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.h index b6d6874..9c1b6bb 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.h @@ -1,6 +1,6 @@ // // UserInfoHealthPopView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.m index a3ab04e..57e31f5 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/UserInfoHealthPopView.m @@ -1,6 +1,6 @@ // // UserInfoHealthPopView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/21. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.h index b5501d4..b4835ad 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.h @@ -1,6 +1,6 @@ // // evaluationPopView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.m index ec7feb1..b5cee3b 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/evaluationPopView.m @@ -1,6 +1,6 @@ // // evaluationPopView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.h index b614386..766c693 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.h @@ -1,6 +1,6 @@ // // BasicHealthTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.m index 0be9f27..9a80306 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/BasicHealthTable.m @@ -1,6 +1,6 @@ // // BasicHealthTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.h index 883898f..0550931 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.h @@ -1,6 +1,6 @@ // // HealthTypeOneTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.m index bac8e7c..9058353 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeOneTableViewCell.m @@ -1,6 +1,6 @@ // // HealthTypeOneTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.h index 9218099..29204fa 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.h @@ -1,6 +1,6 @@ // // HealthTypeTwoTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.m index a93127f..46d2703 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/healethOptionsView(健康选项)/HealthTypeTwoTableViewCell.m @@ -1,6 +1,6 @@ // // HealthTypeTwoTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/6/25. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.h index c86beaa..791ca08 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.h @@ -1,6 +1,6 @@ // // hospitalListTableView.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.m index 8741172..8482249 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/hospitalListTableView.m @@ -1,6 +1,6 @@ // // hospitalListTableView.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/4/18. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.h index d6f162a..5cda3e4 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.h @@ -1,6 +1,6 @@ // // searchHospatilCellTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/20. // diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.m index 7cd8a92..3d050a3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/searchHospatilCellTableViewCell.m @@ -1,6 +1,6 @@ // // searchHospatilCellTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/20. // diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h new file mode 100644 index 0000000..3a723b6 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.h @@ -0,0 +1,16 @@ +// +// XJSosCenterViewController.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/13. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSosCenterViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m new file mode 100644 index 0000000..45d722e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m @@ -0,0 +1,1009 @@ +// +// XJSosCenterViewController.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/4/13. +// + +#import "XJSosCenterViewController.h" +#import "POIAnnotation.h" +#import "CustomAnnotationView.h" +#import "XMButton.h" +#import +#import "LXSegmentTitleView.h" +#import "XJSOSCenterModel.h" +#import +#import +#import +#import "XJSOSAddressView.h" +#import "SOSGroupIMModel.h" +#import "TYMapNavSheet.h" +#import "XJHealthInterveneHomeModel.h" +#import "XJAEDNetWrokModel.h" + +@interface XJSosCenterViewController () +{ + TYMapNavSheet * TYNavSheet; + +} +@property (nonatomic, strong) MAMapView * mapView ; + +@property (nonatomic, strong) UIView * grapView ; + +@property (nonatomic, strong) AMapSearchAPI *search; +@property (nonatomic, strong) AMapLocationManager *locationManager; +@property (nonatomic, copy) AMapLocatingCompletionBlock completionBlock; + + +@property (nonatomic, strong) LXSegmentTitleView *titleView; + +@property(strong, nonatomic) NSArray *titles; + +@property(strong, nonatomic) NSMutableArray * titlesArray; +@property(strong, nonatomic) NSMutableArray * ponisArray; +@property (strong, nonatomic) XJSOSCenterModel * model; +//经纬度 +@property (assign, nonatomic) CGFloat Longitude; +@property (assign, nonatomic) CGFloat latitude; +@property (copy, nonatomic) NSString * type; +// +@property (nonatomic, strong) XJSOSAddressView * addressView; + +@property (nonatomic, strong) XJSOSResourcesModel * resourceModel; + +@property (assign, nonatomic) NSInteger selecetIndex; + +@property (strong, nonatomic) NSMutableArray * hospitalArray; + +@property (strong, nonatomic) NSMutableArray * AedArray; + +@property (strong, nonatomic) NSMutableArray * carArray; + +@end + +@implementation XJSosCenterViewController + +- (NSMutableArray *)carArray { + + if (!_carArray) { + + _carArray = [[NSMutableArray alloc] init]; + } + return _carArray; +} + +- (NSMutableArray *)hospitalArray { + + if (!_hospitalArray) { + + _hospitalArray = [[NSMutableArray alloc] init]; + } + return _hospitalArray; +} + +- (NSMutableArray *)AedArray { + + if (!_AedArray) { + + _AedArray = [[NSMutableArray alloc] init]; + } + return _AedArray; + + +} + +- (NSMutableArray *)titlesArray { + + if (!_titlesArray) { + + _titlesArray = [[NSMutableArray alloc] init]; + } + return _titlesArray; +} + +- (NSMutableArray *)ponisArray { + + if (!_ponisArray) { + + _ponisArray = [[NSMutableArray alloc] init]; + } + return _ponisArray; +} + +- (XJSOSAddressView *)addressView { + + if (!_addressView) { + + _addressView = [[XJSOSAddressView alloc] initWithFrame:CGRectMake(kRealValue(15), kScreenHeight - kTopHeight - kRealValue(130), kScreenWidth - kRealValue(30), kRealValue(110))]; + _addressView.addressDelegate = self; + _addressView.backgroundColor = KWhiteColor; + + } + return _addressView; +} + +- (void)showBottomBtn { + + self.grapView.hidden = false; + +} +- (void)configLocationManager +{ + self.locationManager = [[AMapLocationManager alloc] init]; + + [self.locationManager setDelegate:self]; + + //设置期望定位精度 + [self.locationManager setDesiredAccuracy:kCLLocationAccuracyNearestTenMeters]; + + //设置不允许系统暂停定位 + [self.locationManager setPausesLocationUpdatesAutomatically:NO]; + + //设置允许在后台定位 + [self.locationManager setAllowsBackgroundLocationUpdates:NO]; + + //设置定位超时时间 + [self.locationManager setLocationTimeout:10]; + + //设置逆地理超时时间 + [self.locationManager setReGeocodeTimeout:3]; + + //设置开启虚拟定位风险监测，可以根据需要开启 + [self.locationManager setDetectRiskOfFakeLocation:NO]; +} + +- (void)cleanUpAction +{ + //停止定位 + [self.locationManager stopUpdatingLocation]; + + [self.locationManager setDelegate:nil]; + +} + +- (void)reGeocodeAction +{ + [self.mapView removeAnnotations:self.mapView.annotations]; + + //进行单次带逆地理定位请求 + [self.locationManager requestLocationWithReGeocode:YES completionBlock:self.completionBlock]; +} + +- (void)initCompleteBlock +{ + __weak XJSosCenterViewController *weakSelf = self; + self.completionBlock = ^(CLLocation *location, AMapLocationReGeocode *regeocode, NSError *error) + { + if (error != nil && error.code == AMapLocationErrorLocateFailed) + { + //定位错误：此时location和regeocode没有返回值，不进行annotation的添加 + return; + } + else if (error != nil + && (error.code == AMapLocationErrorReGeocodeFailed + || error.code == AMapLocationErrorTimeOut + || error.code == AMapLocationErrorCannotFindHost + || error.code == AMapLocationErrorBadURL + || error.code == AMapLocationErrorNotConnectedToInternet + || error.code == AMapLocationErrorCannotConnectToHost)) + { + //逆地理错误：在带逆地理的单次定位中，逆地理过程可能发生错误，此时location有返回值，regeocode无返回值，进行annotation的添加 + } + else if (error != nil && error.code == AMapLocationErrorRiskOfFakeLocation) + { + //存在虚拟定位的风险：此时location和regeocode没有返回值，不进行annotation的添加 + + //存在虚拟定位的风险的定位结果 + __unused CLLocation *riskyLocateResult = [error.userInfo objectForKey:@"AMapLocationRiskyLocateResult"]; + //存在外接的辅助定位设备 + __unused NSDictionary *externalAccressory = [error.userInfo objectForKey:@"AMapLocationAccessoryInfo"]; + + return; + } + else + { + //没有错误：location有返回值，regeocode是否有返回值取决于是否进行逆地理操作，进行annotation的添加 + } + + //根据定位信息，添加annotation + MAPointAnnotation *annotation = [[MAPointAnnotation alloc] init]; + [annotation setCoordinate:location.coordinate]; + + //有无逆地理信息，annotationView的标题显示的字段不一样 + if (regeocode) + { + [annotation setTitle:[NSString stringWithFormat:@"%@", regeocode.formattedAddress]]; + [annotation setSubtitle:[NSString stringWithFormat:@"%@-%@-%.2fm", regeocode.citycode, regeocode.adcode, location.horizontalAccuracy]]; + } + else + { + [annotation setTitle:[NSString stringWithFormat:@"lat:%f;lon:%f;", location.coordinate.latitude, location.coordinate.longitude]]; + [annotation setSubtitle:[NSString stringWithFormat:@"accuracy:%.2fm", location.horizontalAccuracy]]; + } + self.Longitude = location.coordinate.longitude; + self.latitude = location.coordinate.latitude; + [self getResourceDataWithType:@"1" Longitude:self.Longitude withLatitude:self.latitude]; + + XJSosCenterViewController *strongSelf = weakSelf; + [strongSelf addAnnotationToMapView:annotation]; + }; +} + +- (void)addAnnotationToMapView:(id)annotation +{ + [self.mapView addAnnotation:annotation]; + [self.mapView showAnnotations:self.mapView.annotations edgePadding:UIEdgeInsetsMake(100, 100, 100, 100) animated:YES]; + [self.mapView setCenterCoordinate:annotation.coordinate animated:YES]; +} + + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. + self.isHidenNaviBar = false; + self.type = @"0"; + self.selecetIndex = 0; + self.navigationItem.title = @"应急就医"; + self.view.backgroundColor = KWhiteColor; + TYNavSheet = [[TYMapNavSheet alloc]init]; + [self initMapView]; +// [self initCompleteBlock]; +// [self configLocationManager]; +// [self reGeocodeAction]; + + self.titleView = [[LXSegmentTitleView alloc] initWithFrame:CGRectMake(0 , 0 , kScreenWidth , kRealValue(35))]; + self.titleView.itemMinMargin = 15.f; + self.titleView.delegate = self; + self.titleView.titleNormalColor = CFontColor1; + self.titleView.titleSelectedColor = KWhiteColor; + self.titleView.btnNormalColor = KClearColor; + self.titleView.btnSelectedColor = UIColorHex(#21BEBD); + self.titleView.backgroundColor = KWhiteColor; + self.titleView.indicatorColor = KWhiteColor; + [self.view addSubview:self.titleView]; + + UIView * grapView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight - kTopHeight - kRealValue(170) - kTabBarHeight, kScreenWidth,kRealValue(170))]; + grapView.backgroundColor = RGBA(0, 0, 0, 0.1); + self.grapView = grapView; + self.grapView.hidden = false; + [self.view addSubview:grapView]; + + + // 添加渐变图层 + CAGradientLayer *gradient = [CAGradientLayer layer]; + gradient.frame = grapView.bounds; + gradient.colors = @[(__bridge id)[UIColor colorWithWhite:1.0 alpha:0.0].CGColor, // 顶部白色透明 + (__bridge id)[UIColor blackColor].CGColor]; // 底部黑色 + gradient.locations = @[@0.0, @1.0]; + gradient.startPoint = CGPointMake(0.5, 0.0); // 从上到下 + gradient.endPoint = CGPointMake(0.5, 1.0); + + [grapView.layer insertSublayer:gradient atIndex:0]; + + + XMButton * callBtn = [[XMButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 - 70 - kRealValue(33), grapView.height - StatusBar_Height - kRealValue(80) , kRealValue(70), kRealValue(70))]; + callBtn.style = SDButtonStyleTop; + callBtn.backgroundColor = KWhiteColor; + callBtn.layer.cornerRadius = 35.0f; + callBtn.layer.masksToBounds = true; + [callBtn setTitle:@"120" forState:UIControlStateNormal]; + callBtn.titleLabel.font = SYSTEMFONT(12); + [callBtn setTitleColor:UIColorHex(#FF422F) forState:UIControlStateNormal]; + [callBtn setImage:[UIImage imageNamed:@"callHospation"] forState:UIControlStateNormal]; + [callBtn addTarget:self action:@selector(callHospationAction) forControlEvents:UIControlEventTouchUpInside]; + callBtn.imageW = 22; + callBtn.imageH = 20; + callBtn.imageY = 19; + callBtn.imageX = 24; + callBtn.interval = 5; + [grapView addSubview:callBtn]; + + XMButton * sosBtn = [[XMButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 + kRealValue(33), callBtn.top , kRealValue(70), kRealValue(70))]; + sosBtn.style = SDButtonStyleTop; + sosBtn.backgroundColor = KWhiteColor; + sosBtn.layer.cornerRadius = 35.0f; + sosBtn.layer.masksToBounds = true; + [sosBtn setTitle:@"应急就医" forState:UIControlStateNormal]; + sosBtn.titleLabel.font = SYSTEMFONT(11); + [sosBtn setTitleColor:UIColorHex(#FF422F) forState:UIControlStateNormal]; + [sosBtn setImage:[UIImage imageNamed:@"callSoSIcon"] forState:UIControlStateNormal]; + [sosBtn addTarget:self action:@selector(callSoSAction) forControlEvents:UIControlEventTouchUpInside]; + sosBtn.imageW = 22; + sosBtn.imageH = 21; + sosBtn.imageY = 19; + sosBtn.imageX = 24; + sosBtn.interval = 5; + [grapView addSubview:sosBtn]; + + self.titles = @[@"油田医院",@"合作医院",@"医疗点",@"AED",@"救护车"]; + self.titleView.segmentTitles = self.titles; + [self.titleView reloadData]; +} + +- (void)initMapView { + if (self.mapView == nil) { + [AMapServices sharedServices].enableHTTPS = YES; + // ///初始化地图 + self.mapView = [[MAMapView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; + self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + self.mapView.showsCompass = YES; //设置成NO表示关闭指南针；YES表示显示指南针 + self.mapView.compassOrigin = CGPointMake(self.mapView.compassOrigin.x, 222); + self.mapView.showsScale = YES; //设置成NO表示不显示比例尺；YES表示显示比例尺 + self.mapView.delegate = self; + ///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码 + _mapView.scaleOrigin= CGPointMake(_mapView.scaleOrigin.x, kRealValue(45)); //设置比例尺位置 + + + [self.view addSubview:self.mapView]; + + + self.mapView.showsUserLocation = YES; + self.mapView.userTrackingMode = MAUserTrackingModeFollow; + + //1.2、新增点A + +// //将目标经纬度设置为地图中心店 + MAUserLocationRepresentation *r = [[MAUserLocationRepresentation alloc] init]; + r.showsAccuracyRing = YES;///精度圈是否显示，默认YES + r.showsHeadingIndicator = YES;///是否显示方向指示(MAUserTrackingModeFollowWithHeading模式开启)。默认为YES + r.enablePulseAnnimation = YES;///内部蓝色圆点是否使用律动效果, 默认YES + r.image = [UIImage imageNamed:@"myLocationIcon"]; ///定位图标, 与蓝色原点互斥 + [self.mapView updateUserLocationRepresentation:r]; + + } + +} + +- (void)viewWillAppear:(BOOL)animated +{ + [super viewWillAppear:animated]; + + NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; + CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; + CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; + [self getResourceDataWithType:@"1" Longitude:longitude withLatitude:latitude]; +} + +- (void)viewDidAppear:(BOOL)animated +{ + [super viewDidAppear:animated]; + + // 开启定位 + self.mapView.showsUserLocation = YES; + self.mapView.userTrackingMode = MAUserTrackingModeFollow; +} + +- (void)viewDidDisappear:(BOOL)animated +{ + [super viewDidDisappear:animated]; +} + +#pragma mark: 拨打120 + +- (void)callHospationAction { + + + NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; + CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; + CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(longitude) forKey:@"longitude"]; + [parmDic setObject:@(latitude) forKey:@"latitude"]; + [parmDic setObject:@"0" forKey:@"callType"]; + [parmDic setObject:self.type forKey:@"resourceId"]; + + + JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"CALLAPI" NeedToken:@""]; + [sosApi PostSoSPhoneEmergency:parmDic]; + + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"tel://120"] options:nil completionHandler:^(BOOL success) { + + }]; +} + +#pragma mark:应急点击 +- (void)callSoSAction { + + [self showMBProgressHUDWithString:@"应急发起中，请稍候..." autoHidden:false]; + NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; + CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; + CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; + + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:@(longitude) forKey:@"longitude"]; + [parmDic setObject:@(latitude) forKey:@"latitude"]; + [parmDic setObject:@"0" forKey:@"name"]; + + + JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"GroupAPI" NeedToken:@""]; + [sosApi getSoSCreateGroupChat:parmDic]; + +} + +#pragma mark - AMapLocationManager Delegate + +- (void)amapLocationManager:(AMapLocationManager *)manager doRequireLocationAuth:(CLLocationManager *)locationManager +{ + [locationManager requestAlwaysAuthorization]; +} + + +#pragma mark - MAMapViewDelegate + +- (void)mapViewRequireLocationAuth:(CLLocationManager *)locationManager +{ + [locationManager requestAlwaysAuthorization]; +} + + +- (void)mapView:(MAMapView *)mapView didChangeUserTrackingMode:(MAUserTrackingMode)mode animated:(BOOL)animated +{ +} + +#pragma mark:定位失败 +- (void)mapView:(MAMapView *)mapView didFailToLocateUserWithError:(NSError *)error { + +} + + +#pragma mark:更新位置 +- (void)mapView:(MAMapView *)mapView didUpdateUserLocation:(MAUserLocation *)userLocation updatingLocation:(BOOL)updatingLocation +{ + if (updatingLocation) + { + DLog(@"userlocation :%f", userLocation.location.coordinate.latitude); + self.Longitude = userLocation.location.coordinate.longitude; + self.latitude = userLocation.location.coordinate.latitude; + NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; +// [self.mapView setCenterCoordinate: userLocation.location.coordinate animated:YES]; + + [user setObject:@(userLocation.location.coordinate.longitude) forKey:USERDEFAULLONG]; + [user setObject:@(userLocation.location.coordinate.latitude) forKey:USERDEFAULLATITUDE]; + [user synchronize]; +// [self getResourceDataWithType:@"0" Longitude:self.Longitude withLatitude:self.latitude]; + +// [self getResourceDataWithType:self.type Longitude:self.Longitude withLatitude:self.latitude]; + } +} + +#pragma mark - LXSegmentTitleViewDataSource + +- (NSArray *)segmentTitlesOfSegmentTitleView:(LXSegmentTitleView *)segmentView { + + return self.titles; +} + +- (void)segmentTitleView:(LXSegmentTitleView *)segmentView selectedIndex:(NSInteger)selectedIndex lastSelectedIndex:(NSInteger)lastSelectedIndex { + + self.mapView.showsUserLocation = YES; + self.mapView.userTrackingMode = MAUserTrackingModeFollow; + + [self getResourceDataWithType:[NSString stringWithFormat:@"%ld",selectedIndex] Longitude:self.Longitude withLatitude:self.latitude]; + [self.addressView removeFromSuperview]; + +// self.selecetIndex = selectedIndex + 1; +// if (self.selecetIndex == 1 || self.selecetIndex == 2) +// { +// [self getResourceDataWithType:[NSString stringWithFormat:@"%ld",self.selecetIndex] Longitude:self.Longitude withLatitude:self.latitude]; +// [self.addressView removeFromSuperview]; +// } +// if (self.selecetIndex ==3) { +// [self.hospitalArray removeAllObjects]; +// [self NearbyHospitalData]; +// [self.addressView removeFromSuperview]; +// } +// if (self.selecetIndex ==4) { +// [self.AedArray removeAllObjects]; +// [self NearbyAEDEquipmentData]; +// [self.addressView removeFromSuperview]; +// } +// +// if (self.selecetIndex ==5) { +// [self.AedArray removeAllObjects]; +// [self NearbySoSCarInf0Data]; +// [self.addressView removeFromSuperview]; +// } + + +} + +#pragma mark:请求医疗点数据 +//- (void)NearbyHospitalData { +// +// NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; +// CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; +// CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; +// +// NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; +// [parmDic setObject:[NSString stringWithFormat:@"%f",longitude] forKey:@"longitude"]; +// [parmDic setObject:[NSString stringWithFormat:@"%f",latitude] forKey:@"latitude"]; +// [parmDic setObject:[NSString stringWithFormat:@"%d",100000] forKey:@"radiusRange"]; +// [parmDic setObject:@"" forKey:@"name"]; +// [parmDic setObject:@(5) forKey:@"resourceNum"]; +// +// JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"HOSPITALAPI" NeedToken:@""]; +// [sosApi getNearbyHomePageHospitalPoint:parmDic]; +// +//} +//#pragma mark:请求医疗点数据 +//- (void)NearbyAEDEquipmentData { +// +// NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; +// CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; +// CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; +// +// NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; +// [parmDic setObject:[NSString stringWithFormat:@"%f",longitude] forKey:@"longitude"]; +// [parmDic setObject:[NSString stringWithFormat:@"%f",latitude] forKey:@"latitude"]; +// [parmDic setObject:[NSString stringWithFormat:@"%d",100000] forKey:@"radiusRange"]; +// [parmDic setObject:@"" forKey:@"aedNum"]; +// +// JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"AEDEQAPI" NeedToken:@""]; +// [sosApi getNearbyAEDEquipmentqNumber:parmDic]; +// +//} + +//#pragma mark:请求救护车数据 +//- (void)NearbySoSCarInf0Data { +// +// NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; +// CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; +// CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; +// +// NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; +// [parmDic setObject:[NSString stringWithFormat:@"%f",longitude] forKey:@"longitude"]; +// [parmDic setObject:[NSString stringWithFormat:@"%f",latitude] forKey:@"latitude"]; +// [parmDic setObject:[NSString stringWithFormat:@"%d",100000] forKey:@"radiusRange"]; +// +// JKCQAPI * sosApi = [[JKCQAPI alloc] init:self tag:@"SOSCARAPI" NeedToken:@""]; +// [sosApi getSoSCarInfoLocationHome:parmDic]; +// +//} + + +- (void)getResourceDataWithType:(NSString *)type + Longitude:(CGFloat)longitude + withLatitude:(CGFloat)latitude{ + + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + + [parmDic setObject:type forKey:@"type"]; + + [parmDic setObject:@(longitude) forKey:@"longitude"]; + + [parmDic setObject:@(latitude) forKey:@"latitude"]; + + JKCQAPI * api = [[JKCQAPI alloc] init:self tag:@"RESOURCES" NeedToken:@""]; + [api GetSoSHomePageResources:parmDic]; + +} + +#pragma mark:网络请求 +- (void)Failed:(NSString*)message tag:(NSString*)tag +{ + + [EasyTextView showErrorText:message]; + [self hiddenAllMBProgressHUD]; + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + if ([tag isEqualToString:@"RESOURCES"]) + { + NSDictionary * parmDic = response; + + XJSOSCenterModel * model = [XJSOSCenterModel modelWithDictionary:parmDic]; + self.model = model; + + NSMutableArray * poiAnnotations = [[NSMutableArray alloc] init]; + [self.mapView removeAnnotations:self.mapView.annotations]; + [self.ponisArray removeAllObjects]; + // 获取用户位置 + MAUserLocation *userLocation = self.mapView.userLocation; + if (userLocation) { + [self.ponisArray addObject:userLocation]; + } + for (XJSOSResourcesModel * resourceModel in model.resources) { + + MAPointAnnotation *pointAnnotation = [[MAPointAnnotation alloc] init]; + pointAnnotation.coordinate = CLLocationCoordinate2DMake(resourceModel.latitude, resourceModel.longitude); + pointAnnotation.title = resourceModel.name; + pointAnnotation.subtitle = resourceModel.address; + [poiAnnotations addObject:pointAnnotation]; + [self addAnnotationToMapView:pointAnnotation]; + [self.ponisArray addObject:pointAnnotation]; + } + } + if ([tag isEqualToString:@"CALLAPI"]) { + NSDictionary * dic = response; + + + } + if ([tag isEqualToString:@"GroupAPI"]) { + NSDictionary * dic = response; + + if ([ESCTUIManager TUIUserStatus] == false) { + + + [self loginImAccount]; + return; + } + + + SOSGroupIMModel * model = [SOSGroupIMModel modelWithDictionary:dic]; + ChatViewController * chatVC = [[ChatViewController alloc] init]; + chatVC.isGroupID = YES; + chatVC.isVideo = YES; + chatVC.eableSendReport = true; + chatVC.eablehaveHelathData = true ; + chatVC.chatID = model.groupId; + chatVC.tfNew = model.tfNew; + chatVC.member = model.member; + chatVC.sosEnd_id = model.sosEnd_id; + chatVC.navTitle = @"应急中心"; + chatVC.questionType = 1; + [self.navigationController pushViewController:chatVC animated:YES]; + [self hiddenAllMBProgressHUD]; + + } + if ([tag isEqualToString:@"loginIMAPI"]) { + + NSDictionary * pamrDic = response; + + IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; + + IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; + iminfoModel.IMInfo = pamrDic; + [HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; + [ESCTUIManager loginInitTUISDKAppidWith:[model.sdkAppId intValue] UserID:model.userId userSig:model.userSig]; + [self callSoSAction]; + } + +// if([tag isEqualToString:@"HOSPITALAPI"]) { +// +// NSArray * responseArray = response; +// +// NSMutableArray * poiAnnotations = [[NSMutableArray alloc] init]; +// [self.mapView removeAnnotations:self.mapView.annotations]; +// [self.ponisArray removeAllObjects]; +// // 获取用户位置 +// MAUserLocation *userLocation = self.mapView.userLocation; +// if (userLocation) { +// [self.ponisArray addObject:userLocation]; +// } +// for (NSDictionary * dic in responseArray) { +// +// XJHealthInterveneHomeModel * hospitalModel = [XJHealthInterveneHomeModel modelWithDictionary:dic]; +// [self.hospitalArray addObject:hospitalModel]; +// +// MAPointAnnotation *pointAnnotation = [[MAPointAnnotation alloc] init]; +// pointAnnotation.coordinate = CLLocationCoordinate2DMake(hospitalModel.latitude, hospitalModel.longitude); +// pointAnnotation.title = hospitalModel.name; +// pointAnnotation.subtitle = hospitalModel.address; +// [poiAnnotations addObject:pointAnnotation]; +// [self addAnnotationToMapView:pointAnnotation]; +// [self.ponisArray addObject:pointAnnotation]; +// } +// +// +// } +// if ([tag isEqualToString:@"AEDEQAPI"]) { +// +// NSArray * responseArray = response; +// +// NSMutableArray * poiAnnotations = [[NSMutableArray alloc] init]; +// [self.mapView removeAnnotations:self.mapView.annotations]; +// [self.ponisArray removeAllObjects]; +// // 获取用户位置 +// MAUserLocation *userLocation = self.mapView.userLocation; +// if (userLocation) { +// [self.ponisArray addObject:userLocation]; +// } +// +// for (NSDictionary * dic in responseArray) { +// +// XJAEDNetWrokModel * aedModel = [XJAEDNetWrokModel modelWithDictionary:dic]; +// [self.AedArray addObject:aedModel]; +// +// MAPointAnnotation *pointAnnotation = [[MAPointAnnotation alloc] init]; +// pointAnnotation.coordinate = CLLocationCoordinate2DMake(aedModel.latitude, aedModel.longitude); +// pointAnnotation.title = aedModel.name; +// pointAnnotation.subtitle = aedModel.installAddress; +// [poiAnnotations addObject:pointAnnotation]; +// [self addAnnotationToMapView:pointAnnotation]; +// [self.ponisArray addObject:pointAnnotation]; +// } +// +// } +// if ([tag isEqualToString:@"SOSCARAPI"]) { +// +// NSArray * responseArray = response; +// +// NSMutableArray * poiAnnotations = [[NSMutableArray alloc] init]; +// [self.mapView removeAnnotations:self.mapView.annotations]; +// [self.ponisArray removeAllObjects]; +// // 获取用户位置 +// MAUserLocation *userLocation = self.mapView.userLocation; +// if (userLocation) { +// [self.ponisArray addObject:userLocation]; +// } +// +// for (NSDictionary * dic in responseArray) { +// +// XJSOSResourcesModel * aedModel = [XJSOSResourcesModel modelWithDictionary:dic]; +// [self.carArray addObject:aedModel]; +// +// MAPointAnnotation *pointAnnotation = [[MAPointAnnotation alloc] init]; +// pointAnnotation.coordinate = CLLocationCoordinate2DMake(aedModel.latitude, aedModel.longitude); +// pointAnnotation.title = aedModel.departCode; +// pointAnnotation.subtitle = aedModel.licensePlateNumber; +// [poiAnnotations addObject:pointAnnotation]; +// [self addAnnotationToMapView:pointAnnotation]; +// [self.ponisArray addObject:pointAnnotation]; +// } +// +// +// } +// + + +} + +- (void)loginImAccount { + + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; + [proctocolApi GetIMLoginAccount:nil]; + +} + +- (MAAnnotationView *)mapView:(MAMapView *)mapView viewForAnnotation:(id)annotation +{ + [self.mapView showAnnotations:self.ponisArray edgePadding:UIEdgeInsetsMake(100, 100, 100, 100) animated:YES]; + //用户当前位置大头针 + if ([annotation isKindOfClass:[MAUserLocation class]]) + { + static NSString *userLocationStyleReuseIndetifier = @"userLocationStyleReuseIndetifier"; + + MAAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:userLocationStyleReuseIndetifier]; + + if (annotationView == nil) + { + annotationView = [[MAAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:userLocationStyleReuseIndetifier]; + } + + annotationView.canShowCallout = true; + annotationView.image = [UIImage imageNamed:@"myLocationIcon"]; + annotationView.frame = CGRectMake(0, 0, 50, 50); + + return annotationView; + } + + if ([annotation isKindOfClass:[MAPointAnnotation class]]) + { + static NSString *reuseIndetifier = @"annotationReuseIndetifier"; + MAAnnotationView *annotationView = (MAAnnotationView *)[mapView dequeueReusableAnnotationViewWithIdentifier:reuseIndetifier]; + if (annotationView == nil) + { + annotationView = [[MAAnnotationView alloc] initWithAnnotation:annotation + reuseIdentifier:reuseIndetifier]; + } +// if (self.selecetIndex == 0) { +// +// for (XJHealthInterveneHomeModel * hospitalModel in self.hospitalArray) { +// +// if (annotation.coordinate.longitude == hospitalModel.longitude && annotation.coordinate.latitude == hospitalModel.latitude) { +// annotationView.image = [UIImage imageNamed:@"medicalAnnitation"]; +// } +// } +// +// // 使用动画效果将点显示在屏幕内 +// [annotationView setSelected:false animated:YES]; +// //设置中心点偏移，使得标注底部中间点成为经纬度对应点 +// annotationView.centerOffset = CGPointMake(0, -18); +// return annotationView; +// } +// if (self.selecetIndex == 3) { +// +// for (XJAEDNetWrokModel * aedModel in self.AedArray) { +// +// if (annotation.coordinate.longitude == aedModel.longitude && annotation.coordinate.latitude == aedModel.latitude) { +// annotationView.image = [UIImage imageNamed:@"AEDIcon"]; +// } +// } +// // 使用动画效果将点显示在屏幕内 +// [annotationView setSelected:false animated:YES]; +// //设置中心点偏移，使得标注底部中间点成为经纬度对应点 +// annotationView.centerOffset = CGPointMake(0, -18); +// return annotationView; +// +// } +// //救护车 +// if (self.selecetIndex == 5) { +// +// for (XJSOSResourcesModel * aedModel in self.carArray) { +// +// if (annotation.coordinate.longitude == aedModel.longitude && annotation.coordinate.latitude == aedModel.latitude) { +// annotationView.image = [UIImage imageNamed:@"sosCard"]; +// } +// } +// // 使用动画效果将点显示在屏幕内 +// [annotationView setSelected:false animated:YES]; +// //设置中心点偏移，使得标注底部中间点成为经纬度对应点 +// annotationView.centerOffset = CGPointMake(0, -18); +// return annotationView; +// +// } +// else +// { + for (XJSOSResourcesModel * resourceModel in self.model.resources) { + + if (annotation.coordinate.longitude == resourceModel.longitude && annotation.coordinate.latitude == resourceModel.latitude) { + if ([resourceModel.type integerValue]== 1) { + annotationView.image = [UIImage imageNamed:@"youtianHosoital"]; + } + if ([resourceModel.type integerValue]== 2) { + annotationView.image = [UIImage imageNamed:@"hezuoHospital"]; + } + if ([resourceModel.type integerValue]== 3) { + annotationView.image = [UIImage imageNamed:@"medicalAnnitation"]; + } + if ([resourceModel.type integerValue]== 4) { + annotationView.image = [UIImage imageNamed:@"AEDIcon"]; + } + if ([resourceModel.type integerValue]== 5) { + annotationView.image = [UIImage imageNamed:@"sosCard"]; + } + if ([resourceModel.type integerValue]== 6) { + annotationView.image = [UIImage imageNamed:@"sosPeople"]; + } + + } + } + // 使用动画效果将点显示在屏幕内 + [annotationView setSelected:false animated:YES]; + //设置中心点偏移，使得标注底部中间点成为经纬度对应点 + annotationView.centerOffset = CGPointMake(0, -18); + + return annotationView; + } + + +// } + return nil; +} + +- (void)mapView:(MAMapView *)mapView didSelectAnnotationView:(MAAnnotationView *)view +{ + + self.grapView.hidden = true; + + + if (self.selecetIndex == 3) { //医疗点 + + for (XJHealthInterveneHomeModel * hospitalModel in self.hospitalArray) { + + if (view.annotation.coordinate.longitude == hospitalModel.longitude && view.annotation.coordinate.latitude == hospitalModel.latitude) { + + XJSOSResourcesModel * resourceModel = [[XJSOSResourcesModel alloc] init]; + + resourceModel.address = hospitalModel.address; + resourceModel.name = hospitalModel.name; + resourceModel.mobile = hospitalModel.mobile; + resourceModel.latitude = hospitalModel.latitude; + resourceModel.longitude = hospitalModel.longitude; + + self.addressView.resourceModel = resourceModel; + self.resourceModel = resourceModel; + [self.mapView addSubview:self.addressView]; + } + } + return; + + } + if (self.selecetIndex == 4) { //aed + + for (XJAEDNetWrokModel * aedModel in self.AedArray) { + + if (view.annotation.coordinate.longitude == aedModel.longitude && view.annotation.coordinate.latitude == aedModel.latitude) { + + XJHealthInterveneAEDModel * subAedModel = [[XJHealthInterveneAEDModel alloc] init]; + + subAedModel.resourceAddress = aedModel.installAddress; + subAedModel.resourceName = aedModel.name; + subAedModel.principalPhone = aedModel.chargeFirstMobile; + self.addressView.aedModel = subAedModel; + + XJSOSResourcesModel * resourceModel = [[XJSOSResourcesModel alloc] init]; + resourceModel.address = aedModel.installAddress; + resourceModel.name = aedModel.name; + resourceModel.mobile = aedModel.chargeFirstMobile; + resourceModel.latitude = aedModel.latitude; + resourceModel.longitude = aedModel.longitude; + self.resourceModel = resourceModel; + [self.mapView addSubview:self.addressView]; + } + } + return; + + } + if (self.selecetIndex == 5) { + + for (XJSOSResourcesModel * aedModel in self.carArray) { + + if (view.annotation.coordinate.longitude == aedModel.longitude && view.annotation.coordinate.latitude == aedModel.latitude) { + + XJSOSResourcesModel * resourceModel = [[XJSOSResourcesModel alloc] init]; + resourceModel.address = aedModel.licensePlateNumber; + resourceModel.name = aedModel.departCode; + resourceModel.latitude = aedModel.latitude; + resourceModel.longitude = aedModel.longitude; + self.resourceModel = resourceModel; + self.addressView.resourceModel = resourceModel; + [self.mapView addSubview:self.addressView]; + } + } + return; + + } + for (XJSOSResourcesModel * resourceModel in self.model.resources) { + + + if (view.annotation.coordinate.longitude == resourceModel.longitude && view.annotation.coordinate.latitude == resourceModel.latitude) { + + self.addressView.resourceModel = resourceModel; + self.resourceModel = resourceModel; + [self.mapView addSubview:self.addressView]; + } + + } + +// } +} + +- (void)addressNavLocataion { + + NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; + CGFloat longitude = [[user objectForKey:USERDEFAULLONG] floatValue]; + CGFloat latitude = [[user objectForKey:USERDEFAULLATITUDE] floatValue]; + + + + NSMutableDictionary * Dic = [[NSMutableDictionary alloc] initWithObjectsAndKeys:@"我的位置",@"startName",self.resourceModel.address,@"endName", nil]; + [TYNavSheet ShowMapNavSheetSuperView:self withLocationDic:Dic withstartCoor:CLLocationCoordinate2DMake(latitude, longitude) withendCoor:CLLocationCoordinate2DMake(self.resourceModel.latitude, self.resourceModel.longitude)]; + +} + +-(void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex +{ + [TYNavSheet actionSheetBtnClick:buttonIndex]; +} + +- (void)resourcePhoneOnclick:(NSString *)phoneNumber { + + + [[UIApplication sharedApplication] openURL:[NSURL URLWithString: [NSString stringWithFormat:@"tel://%@",phoneNumber]] options:nil completionHandler:^(BOOL success) { + + }]; +} +//在线时票据过期：此时您需要生成新的 userSig，并再次重新调用初始化。 +- (void)onKickedOffline { + + [HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; + [ESCTUIManager outLoginTUISDK]; + KPostNotification(KNotificationLoginStateChange, @NO); + +} +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end + diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJAEDNetWrokModel.h b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJAEDNetWrokModel.h new file mode 100644 index 0000000..0d76448 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJAEDNetWrokModel.h @@ -0,0 +1,75 @@ +// +// XJAEDNetWrokModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJAEDNetWrokModel : NSObject + +@property (nonatomic, copy) NSString * aed_id; +@property (nonatomic, copy) NSString * routerStatus_dictText; +@property (nonatomic, copy) NSString * installAddressImg; +@property (nonatomic, copy) NSString * manageDepartName; +@property (nonatomic, copy) NSString * installAddress; +@property (nonatomic, copy) NSString * batteryStatus; + +@property (nonatomic, copy) NSString * handleExplain; +@property (nonatomic, copy) NSString * videoHandle; +@property (nonatomic, copy) NSString * aedAnnexStatus; +@property (nonatomic, copy) NSString * chargeFirstMobile; +@property (nonatomic, copy) NSString * manageUserName; +@property (nonatomic, copy) NSString * routerSerialNum; + +@property (nonatomic, copy) NSString * manageUserId; +@property (nonatomic, copy) NSString * secondDepartName; +@property (nonatomic, copy) NSString * hostModel; +@property (nonatomic, copy) NSString * hostSerialNum; +@property (nonatomic, copy) NSString * delFlag; +@property (nonatomic, copy) NSString * annex; + + +@property (nonatomic, copy) NSString * batteryModel; +@property (nonatomic, copy) NSString * updateBy; +@property (nonatomic, copy) NSString * checkStatus_dictText; +@property (nonatomic, copy) NSString * routerModel; +@property (nonatomic, copy) NSString * name; +@property (nonatomic, copy) NSString * updateTime; + +@property (nonatomic, copy) NSString * electrodeSheetValidTime; +@property (nonatomic, copy) NSString * createBy; +@property (nonatomic, copy) NSString * departName; +@property (nonatomic, copy) NSString * manageDepartCode; +@property (nonatomic, assign) long distance; +@property (nonatomic, copy) NSString * aedImg; + +@property (nonatomic, assign) double longitude; +@property (nonatomic, copy) NSString * manageUserMobile; +@property (nonatomic, assign) double latitude; +@property (nonatomic, copy) NSString * departCode; + +@property (nonatomic, copy) NSString * electrodeSheetStatus; +@property (nonatomic, copy) NSString * batteryStatus_dictText; +@property (nonatomic, assign) NSInteger coverUserNum; + +@property (nonatomic, copy) NSString * chargeSecond; +@property (nonatomic, copy) NSString * chargeSecondMobile; + +@property (nonatomic, copy) NSString * checkStatus; +@property (nonatomic, copy) NSString * createTime; +@property (nonatomic, copy) NSString * mfrsName; +@property (nonatomic, copy) NSString * warrantyEndDate; +@property (nonatomic, copy) NSString * warrantyStartDate; +@property (nonatomic, copy) NSString * chargeFirst; +@property (nonatomic, copy) NSString * routerStatus; +@property (nonatomic, copy) NSString * electrodeSheetStatus_dictText; +@property (nonatomic, copy) NSString * mfrsMobile; +@property (nonatomic, copy) NSString * memo; +@property (nonatomic, assign) NSInteger batteryVoltage; +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJAEDNetWrokModel.m b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJAEDNetWrokModel.m new file mode 100644 index 0000000..7a757b3 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJAEDNetWrokModel.m @@ -0,0 +1,19 @@ +// +// AEDNetWrokModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/19. +// + +#import "XJAEDNetWrokModel.h" + +@implementation XJAEDNetWrokModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"aed_id" :@"id"}; + return dic; +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneAEDModel.h b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneAEDModel.h new file mode 100644 index 0000000..fb089f5 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneAEDModel.h @@ -0,0 +1,36 @@ +// +// HealthInterveneAEDModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJHealthInterveneAEDModel : NSObject + +@property (nonatomic, copy) NSString * aed_id; +@property (nonatomic, copy) NSString * resourceAddress; +@property (nonatomic, copy) NSString * principalName; +@property (nonatomic, copy) NSString * principalPhone; +@property (nonatomic, copy) NSString * updateBy; +@property (nonatomic, copy) NSString * resourceDesc; + +@property (nonatomic, copy) NSString * resourceType; +@property (nonatomic, assign) double longitude; +@property (nonatomic, copy) NSString * delFlag; +@property (nonatomic, assign) double latitude; +@property (nonatomic, copy) NSString * resourceName; + +@property (nonatomic, copy) NSString * resourceImg; +@property (nonatomic, copy) NSString * resourceNo; +@property (nonatomic, assign) long distance; + +@property (nonatomic, strong) NSArray * assoSymtomIds; +@property (nonatomic, copy) NSString * status; +@property (nonatomic, copy) NSString * createBy; +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneAEDModel.m b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneAEDModel.m new file mode 100644 index 0000000..d49ab1e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneAEDModel.m @@ -0,0 +1,19 @@ +// +// HealthInterveneAEDModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/12/19. +// + +#import "XJHealthInterveneAEDModel.h" + +@implementation XJHealthInterveneAEDModel + + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"aed_id" :@"id"}; + return dic; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneHomeModel.h b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneHomeModel.h new file mode 100644 index 0000000..950b192 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneHomeModel.h @@ -0,0 +1,56 @@ +// +// XJHealthInterveneHomeModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/9/12. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJHealthInterveneHomeModel : NSObject + +@property (nonatomic, copy) NSString * tit; +@property (nonatomic, copy) NSString * healthImg; +@property (nonatomic, copy) NSString * des; +@property (nonatomic, copy) NSString * currentData; +@property (nonatomic, copy) NSString * backImg; +@property (nonatomic, copy) NSString * type; + +//医院 +@property (nonatomic, copy) NSString * status; +@property (nonatomic, copy) NSString * status_dictText; +@property (nonatomic, copy) NSString * delFlag; +@property (nonatomic, copy) NSString * createBy; +@property (nonatomic, copy) NSString * createTime; +@property (nonatomic, copy) NSString * updateBy; +@property (nonatomic, copy) NSString * updateTime; +@property (nonatomic, copy) NSString * memo; +@property (nonatomic, copy) NSString * detail_id; +@property (nonatomic, copy) NSString * name; +@property (nonatomic, copy) NSString * address; +@property (nonatomic, copy) NSString * mobile; +@property (nonatomic, assign) double longitude; +@property (nonatomic, assign) double latitude; +@property (nonatomic, copy) NSString * aidrange; +@property (nonatomic, copy) NSString * gdId; +@property (nonatomic, copy) NSString * url; +@property (nonatomic, copy) NSString * level; +@property (nonatomic, copy) NSString * img; +@property (nonatomic, copy) NSString * hospitalId; +@property (nonatomic, copy) NSString * hospitalName; +@property (nonatomic, copy) NSString * departCode; +@property (nonatomic, copy) NSString * departName; +@property (nonatomic, copy) NSString * adminUser; +@property (nonatomic, copy) NSString * setUpTime; +@property (nonatomic, copy) NSString * medicalStaffNum; +@property (nonatomic, copy) NSString * radiationNum; +@property (nonatomic, copy) NSString * ambulanceNum; +@property (nonatomic, copy) NSString * radiationDepart; +@property (nonatomic, strong) NSArray * radiationDepartList; +@property (nonatomic, copy) NSString * distance; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneHomeModel.m b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneHomeModel.m new file mode 100644 index 0000000..10efd62 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJHealthInterveneHomeModel.m @@ -0,0 +1,18 @@ +// +// XJHealthInterveneHomeModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/9/12. +// + +#import "XJHealthInterveneHomeModel.h" + +@implementation XJHealthInterveneHomeModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"detail_id" :@"id"}; + return dic; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h new file mode 100644 index 0000000..c87c18e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h @@ -0,0 +1,54 @@ +// +// XJSOSCenterModel.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/5/13. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface XJSOSTitleModel : NSObject + +@property (nonatomic, copy) NSString * title; + +@property (nonatomic, copy) NSString * value; + + +@end + +@interface XJSOSResourcesModel : NSObject + +@property (nonatomic, copy) NSString * province; +@property (nonatomic, copy) NSString * gdId; +@property (nonatomic, assign) double latitude; +@property (nonatomic, copy) NSString * city; +@property (nonatomic, copy) NSString * name; +@property (nonatomic, copy) NSString * type; +@property (nonatomic, copy) NSString * level; +@property (nonatomic, assign) double longitude; +@property (nonatomic, copy) NSString * distance; +@property (nonatomic, copy) NSString * reaourceID; +@property (nonatomic, copy) NSString * address; +@property (nonatomic, copy) NSString * img; +@property (nonatomic, copy) NSString * mobile; +@property (nonatomic, copy) NSString * licensePlateNumber; + +@property (nonatomic, copy) NSString * departCode; + + +@property (nonatomic, copy) NSString * driverName; + + +@end + + +@interface XJSOSCenterModel : NSObject + +@property (nonatomic, strong) NSArray * resources; +@property (nonatomic, strong) NSArray * dicts; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.m b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.m new file mode 100644 index 0000000..4c47654 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.m @@ -0,0 +1,36 @@ +// +// XJSOSCenterModel.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/5/13. +// + +#import "XJSOSCenterModel.h" + +@implementation XJSOSTitleModel + + +@end + +@implementation XJSOSResourcesModel + ++ (NSDictionary *)modelCustomPropertyMapper +{ + NSDictionary * dic =@{@"reaourceID" :@"id"}; + return dic; +} + +@end + +@implementation XJSOSCenterModel + ++ (NSDictionary *)modelContainerPropertyGenericClass +{ + + + return @{@"resources":[XJSOSResourcesModel class], + @"dicts":[XJSOSTitleModel class] + }; + +} +@end diff --git a/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.h b/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.h new file mode 100644 index 0000000..69db27c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.h @@ -0,0 +1,34 @@ +// +// XJSOSAddressView.h +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/2. +// + +#import +#import "XJSOSCenterModel.h" +#import "XJHealthInterveneAEDModel.h" +NS_ASSUME_NONNULL_BEGIN + +@protocol SoSBottomProtocol + +- (void)addressNavLocataion; + +- (void)resourcePhoneOnclick:(NSString *)phoneNumber; + +- (void)showBottomBtn; + +@end + +@interface XJSOSAddressView : UIView + +@property (nonatomic, strong) XJSOSResourcesModel * resourceModel; + +@property (nonatomic, strong) XJHealthInterveneAEDModel * aedModel; + + +@property (nonatomic, weak)id addressDelegate; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m b/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m new file mode 100644 index 0000000..975a927 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m @@ -0,0 +1,224 @@ +// +// XJSOSAddressView.m +// XinjiangProject +// +// Created by 仁康信息 on 2023/6/2. +// + +#import "XJSOSAddressView.h" + + +@interface XJSOSAddressView () + +@property (nonatomic, strong) UILabel * lvLabel; +@property (nonatomic, strong) UILabel * hospitalName; +@property (nonatomic, strong) UILabel * phoneLabel; +@property (nonatomic, strong) UILabel * addressLabel; + + +@end + + +@implementation XJSOSAddressView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +- (instancetype)initWithFrame:(CGRect)frame { + + if (self = [super initWithFrame:frame]) { + + [self createUI]; + } + return self; +} + +- (void)createUI { + + self.layer.cornerRadius = 10; + self.layer.masksToBounds = true; + self.lvLabel = [[UILabel alloc] init]; + self.lvLabel.layer.cornerRadius = 3.0f; + self.lvLabel.layer.masksToBounds = true; + self.lvLabel.text = @"--"; + self.lvLabel.textColor = KWhiteColor; + self.lvLabel.backgroundColor = UIColorHex(#21BEBD); + self.lvLabel.textAlignment = NSTextAlignmentCenter; + self.lvLabel.font = MEDIUMFONT(9); + self.lvLabel.hidden = true; + [self addSubview:self.lvLabel]; + + [self.lvLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(18)); + make.width.mas_offset(60); + make.top.mas_offset(20); + make.height.mas_offset(16); + + }]; + + self.hospitalName = [[UILabel alloc] init]; + self.hospitalName.text = @"--"; + self.hospitalName.font = BOLDSYSTEMFONT(14); + self.hospitalName.textColor = UIColorHex(#333333); + self.hospitalName.textAlignment = NSTextAlignmentLeft; + [self addSubview:self.hospitalName]; + + [self.hospitalName mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.lvLabel.mas_right).offset(10); + make.right.mas_offset(-30); + make.top.mas_offset(20); + make.height.mas_offset(15); + + }]; + + self.phoneLabel = [[UILabel alloc] init]; + self.phoneLabel.text = @"--"; + self.phoneLabel.font = MEDIUMFONT(13); + self.phoneLabel.textColor = UIColorHex(#999999); + self.phoneLabel.textAlignment = NSTextAlignmentLeft; + [self addSubview:self.phoneLabel]; + + [self.phoneLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(15)); + make.right.mas_offset(-30); + make.top.mas_equalTo(self.lvLabel.mas_bottom).offset(12); + make.height.mas_offset(15); + + }]; + + + self.addressLabel = [[UILabel alloc] init]; + self.addressLabel.text = @"--km | ---"; + self.addressLabel.font = MEDIUMFONT(13); + self.addressLabel.textColor = UIColorHex(#999999); + [self addSubview:self.addressLabel]; + + [self.addressLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(18)); + make.right.mas_offset(kRealValue(-15)); + make.top.mas_equalTo(self.phoneLabel.mas_bottom).offset(10); + make.bottom.mas_offset(-10); + }]; + + [self.addressLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; + + + UIButton * closeBtn = [[UIButton alloc] init]; + [closeBtn setImage:IMAGE_NAMED(@"close_icon") forState:UIControlStateNormal]; + [closeBtn addTarget:self action:@selector(closePopView) forControlEvents:UIControlEventTouchUpInside]; + [self addSubview:closeBtn]; + + [closeBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_offset(kRealValue(-15)); + make.top.mas_equalTo(@10); + make.width.height.mas_offset(20); + }]; + + UIButton * navBtn = [[UIButton alloc] init]; + [navBtn setImage:IMAGE_NAMED(@"address_NavLoctaion") forState:UIControlStateNormal]; + [navBtn addTarget:self action:@selector(navLocationView) forControlEvents:UIControlEventTouchUpInside]; + [self addSubview:navBtn]; + + [navBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_offset(kRealValue(-21)); + make.top.mas_equalTo(self.hospitalName.mas_bottom).offset(4); + make.width.height.mas_offset(26); + }]; + + UIButton * samllPhoneBtn = [[UIButton alloc] init]; + [samllPhoneBtn setImage:IMAGE_NAMED(@"address_phone") forState:UIControlStateNormal]; + [samllPhoneBtn addTarget:self action:@selector(LocationPhoneView) forControlEvents:UIControlEventTouchUpInside]; + [self addSubview:samllPhoneBtn]; + + [samllPhoneBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.mas_equalTo(navBtn.mas_left).offset(-14); + make.top.mas_equalTo(self.hospitalName.mas_bottom).offset(4); + make.width.height.mas_offset(26); + }]; +} + +- (void)setResourceModel:(XJSOSResourcesModel *)resourceModel { + _resourceModel = resourceModel; + if ( !ValidStr(_resourceModel.level) ) { + self.lvLabel.hidden = false; + self.lvLabel.text = _resourceModel.level; + [self.hospitalName mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(self.lvLabel.mas_right).offset(10); + make.right.mas_offset(-30); + make.top.mas_offset(20); + make.height.mas_offset(15); + + }]; + }else + { + [self.hospitalName mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(18)); + make.right.mas_offset(-30); + make.top.mas_offset(20); + make.height.mas_offset(15); + + }]; + } + self.addressLabel.text = _resourceModel.address; + self.hospitalName.text = _resourceModel.name; + self.phoneLabel.text = _resourceModel.mobile; +} +- (void)setAedModel:(XJHealthInterveneAEDModel *)aedModel { + + _aedModel = aedModel; + [self.hospitalName mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(18)); + make.right.mas_offset(-30); + make.top.mas_offset(20); + make.height.mas_offset(15); + + }]; + self.addressLabel.text = [NSString stringWithFormat:@"%.2f | %@",_aedModel.distance / 1000.0, _aedModel.resourceAddress] ; + self.hospitalName.text = _aedModel.resourceName; + self.phoneLabel.text = _aedModel.principalPhone; + +} + +- (void)navLocationView { + + if ([self.addressDelegate respondsToSelector:@selector(addressNavLocataion)]) { + + [self.addressDelegate addressNavLocataion]; + } + +} + +- (void)LocationPhoneView { + + if ([self.addressDelegate respondsToSelector:@selector(resourcePhoneOnclick:)]) { + + if (self.resourceModel) { + [self.addressDelegate resourcePhoneOnclick:self.resourceModel.mobile]; + + } + if (self.aedModel ) { + [self.addressDelegate resourcePhoneOnclick:self.aedModel.principalPhone]; + + } + } + + +} + + +- (void)closePopView { + + if ([self.addressDelegate respondsToSelector:@selector(showBottomBtn)]) { + + [self.addressDelegate showBottomBtn]; + } + + [self removeFromSuperview]; +} + +@end diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h index ff38eef..e6bcbf2 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.h @@ -1,6 +1,6 @@ // // ChatListViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.m index 9826250..0c1c173 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatList/ChatListViewController.m @@ -1,6 +1,6 @@ // // ChatListViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h index 8f4a7c1..e1825ad 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.h @@ -1,6 +1,6 @@ // // ChatViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m index 08e8ae7..04236ee 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m @@ -1,6 +1,6 @@ // // ChatViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h index 11568d5..1a39b16 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.h @@ -1,6 +1,6 @@ // // ChatMapViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/5. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.m index cb6d73e..dc74b83 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/ChatMapViewController.m @@ -1,6 +1,6 @@ // // ChatMapViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/5. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h index fdef8c7..f5b239f 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.h @@ -1,6 +1,6 @@ // // SendHealthDataViewController.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m index 78cd308..90972c1 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Controller/SendHealthDataViewController.m @@ -1,6 +1,6 @@ // // SendHealthDataViewController.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.h index c988d64..3c8d9bb 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.h @@ -1,6 +1,6 @@ // // DoctiorIDCardCellData.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/8. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m index b1b5008..1d0f19d 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m @@ -1,6 +1,6 @@ // // DoctiorIDCardCellData.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/8. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.h index dc1b0e7..a264aec 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.h @@ -1,6 +1,6 @@ // // DoctorIDCardMessageCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/8. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m index 9a0f69c..b55c2d7 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m @@ -1,6 +1,6 @@ // // DoctorIDCardMessageCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/8. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.h index 6d9ae6a..7932499 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.h @@ -1,6 +1,6 @@ // // EndSystemCellData.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/10. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.m index 6ca284f..f957c6f 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemCellData.m @@ -1,6 +1,6 @@ // // EndSystemCellData.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/10. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.h index 61e9cab..08dded0 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.h @@ -1,6 +1,6 @@ // // EndSystemSoSCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/10. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.m index 728183d..85c8368 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/EndSystemCell/EndSystemSoSCell.m @@ -1,6 +1,6 @@ // // EndSystemSoSCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/10. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.h index 151d9ee..233e9f5 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.h @@ -1,6 +1,6 @@ // // chatPictureCollectionViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.m index 9151f11..6f62193 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/chatPictureCollectionViewCell.m @@ -1,6 +1,6 @@ // // chatPictureCollectionViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.h index 73103de..b8fa896 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.h @@ -1,6 +1,6 @@ // // healthDataCustomCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.m index 7cb2276..90e028e 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCell.m @@ -1,6 +1,6 @@ // // healthDataCustomCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.h index b5c8dea..eb7f1ec 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.h @@ -1,6 +1,6 @@ // // healthDataCustomCellData.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.m index 5cfb9d2..0425f39 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/HealthDataCustom/healthDataCustomCellData.m @@ -1,6 +1,6 @@ // // healthDataCustomCellData.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.h index ffbe4f2..020c9b7 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.h @@ -1,6 +1,6 @@ // // sendPhysicalCustomCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/25. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.m index 558cdbd..6da8c23 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCell.m @@ -1,6 +1,6 @@ // // sendPhysicalCustomCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/25. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.h index 5aa1f5d..2a72a00 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.h @@ -1,6 +1,6 @@ // // sendPhysicalCustomCellData.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/25. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.m index a895575..ef0ae45 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/SendPhysicalModel/sendPhysicalCustomCellData.m @@ -1,6 +1,6 @@ // // sendPhysicalCustomCellData.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/25. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.h index aa89cee..f0521c9 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.h @@ -1,6 +1,6 @@ // // StarMarkCellData.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/3. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.m index beba219..eb7dd71 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCellData.m @@ -1,6 +1,6 @@ // // StarMarkCellData.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/3. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.h index 31792c2..a4c32c7 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.h @@ -1,6 +1,6 @@ // // StarMarkCustomCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/3. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.m index afb886e..f51f4ec 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/StarMarkCustom/StarMarkCustomCell.m @@ -1,6 +1,6 @@ // // StarMarkCustomCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/3. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.h index 46094da..0c46af4 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.h @@ -1,6 +1,6 @@ // // userDataInfoCellData.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.m index b922b12..406f0d8 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoCellData.m @@ -1,6 +1,6 @@ // // userDataInfoCellData.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.h index 74b20f6..7dbfce3 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.h @@ -1,6 +1,6 @@ // // userDataInfoChatCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.m index a4498a3..3233f4f 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/userCustom/userDataInfoChatCell.m @@ -1,6 +1,6 @@ // // userDataInfoChatCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/2/13. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.h index 7e92c9c..22c3403 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.h @@ -1,6 +1,6 @@ // // SendReportModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/24. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.m b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.m index 969b1dc..266b6cf 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/SendReportModel.m @@ -1,6 +1,6 @@ // // SendReportModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/24. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.h b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.h index 0ce64af..b4d6cab 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.h @@ -1,6 +1,6 @@ // // sendHealthModel.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.m b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.m index 8bd8c00..62c7421 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/Model/sendHealthModel.m @@ -1,6 +1,6 @@ // // sendHealthModel.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.h b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.h index 26f1d8b..4d5088d 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.h @@ -1,6 +1,6 @@ // // SendHealthDataTable.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.m b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.m index de1cd04..e52faba 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTable.m @@ -1,6 +1,6 @@ // // SendHealthDataTable.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.h b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.h index 47ae8e0..adcb439 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.h @@ -1,6 +1,6 @@ // // SendHealthDataTableViewCell.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.m index e957cf5..d589e5b 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/View/SendHealthDataTableViewCell.m @@ -1,6 +1,6 @@ // // SendHealthDataTableViewCell.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/7/27. // diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/Contents.json new file mode 100644 index 0000000..6b23319 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "HeardHistory_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "HeardHistory_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "HeardHistory_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon.png new file mode 100644 index 0000000..f1af397 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon@2x.png new file mode 100644 index 0000000..7a3db6a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon@3x.png new file mode 100644 index 0000000..3f6a976 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardHistory_icon.imageset/HeardHistory_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/Contents.json new file mode 100644 index 0000000..b9b11f2 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "HeardProgress_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "HeardProgress_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "HeardProgress_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon.png new file mode 100644 index 0000000..dd44e05 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon@2x.png new file mode 100644 index 0000000..d878b40 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon@3x.png new file mode 100644 index 0000000..bf0db9a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/HeardProgress_icon.imageset/HeardProgress_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/Contents.json new file mode 100644 index 0000000..95c5831 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "tabbar_homepage_normal_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_homepage_normal_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_homepage_normal_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon.png new file mode 100644 index 0000000..e6c7c59 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@2x.png new file mode 100644 index 0000000..acce67b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@3x.png new file mode 100644 index 0000000..e046a37 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/Contents.json new file mode 100644 index 0000000..9a97ad8 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "tabBar_homepage_selected_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabBar_homepage_selected_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabBar_homepage_selected_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon.png new file mode 100644 index 0000000..75347c7 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon@2x.png new file mode 100644 index 0000000..e3920c7 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon@3x.png new file mode 100644 index 0000000..5a3cca4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_selected_icon.imageset/tabBar_homepage_selected_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Contents.json new file mode 100644 index 0000000..4583514 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Satisfaction_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Satisfaction_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Satisfaction_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon.png new file mode 100644 index 0000000..6122bcb Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon@2x.png new file mode 100644 index 0000000..784f336 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon@3x.png new file mode 100644 index 0000000..d9f17f9 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Satisfaction_icon.imageset/Satisfaction_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/Contents.json new file mode 100644 index 0000000..df6f7c1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "allRoomDoctor.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "allRoomDoctor@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "allRoomDoctor@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor.png new file mode 100644 index 0000000..dc87a1f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor@2x.png new file mode 100644 index 0000000..67abe23 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor@3x.png new file mode 100644 index 0000000..681d58b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/allRoomDoctor.imageset/allRoomDoctor@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/Contents.json new file mode 100644 index 0000000..8b742c3 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "cancalSuccess.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "cancalSuccess@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "cancalSuccess@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess.png new file mode 100644 index 0000000..c136ed4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess@2x.png new file mode 100644 index 0000000..b3777eb Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess@3x.png new file mode 100644 index 0000000..403fc41 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/cancalSuccess.imageset/cancalSuccess@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/Contents.json new file mode 100644 index 0000000..6697e93 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "changwei_data.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "changwei_data@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "changwei_data@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data.png new file mode 100644 index 0000000..1e25ec9 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data@2x.png new file mode 100644 index 0000000..ef0428c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data@3x.png new file mode 100644 index 0000000..93988ab Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/changwei_data.imageset/changwei_data@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/Contents.json new file mode 100644 index 0000000..44437aa --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "chooseCircle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "chooseCircle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "chooseCircle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle.png new file mode 100644 index 0000000..a548db3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle@2x.png new file mode 100644 index 0000000..59c4e02 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle@3x.png new file mode 100644 index 0000000..f350b36 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/chooseCircle.imageset/chooseCircle@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/Contents.json new file mode 100644 index 0000000..0ec1cd0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "choose_Selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "choose_Selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "choose_Selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected.png new file mode 100644 index 0000000..df3dce3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected@2x.png new file mode 100644 index 0000000..75fe2a7 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected@3x.png new file mode 100644 index 0000000..8ec4da3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_Selected.imageset/choose_Selected@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/Contents.json new file mode 100644 index 0000000..ab5e7b9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "choose_nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "choose_nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "choose_nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal.png new file mode 100644 index 0000000..1112c38 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal@2x.png new file mode 100644 index 0000000..20c5a93 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal@3x.png new file mode 100644 index 0000000..6f9ecc6 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/choose_nomal.imageset/choose_nomal@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/Contents.json new file mode 100644 index 0000000..c855965 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "closeImage.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "closeImage@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "closeImage@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage.png new file mode 100644 index 0000000..f95849a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage@2x.png new file mode 100644 index 0000000..a4a7f86 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage@3x.png new file mode 100644 index 0000000..4db2b04 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/closeImage.imageset/closeImage@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/Contents.json new file mode 100644 index 0000000..3fbde50 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "collectLove.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "collectLove@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "collectLove@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove.png new file mode 100644 index 0000000..a5ed0e3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove@2x.png new file mode 100644 index 0000000..ffecacf Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove@3x.png new file mode 100644 index 0000000..a7e41f9 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/collectLove.imageset/collectLove@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/Contents.json new file mode 100644 index 0000000..43aeb6d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "delect.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "delect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "delect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect.png new file mode 100644 index 0000000..b0c3988 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect@2x.png new file mode 100644 index 0000000..e86f011 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect@3x.png new file mode 100644 index 0000000..f658d44 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/delect.imageset/delect@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/Contents.json new file mode 100644 index 0000000..2e51132 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "detail_collect.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "detail_collect@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "detail_collect@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect.png new file mode 100644 index 0000000..26acef2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect@2x.png new file mode 100644 index 0000000..ceeaca1 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect@3x.png new file mode 100644 index 0000000..746d4f8 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/detail_collect.imageset/detail_collect@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/Contents.json new file mode 100644 index 0000000..17ad99c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "doctorHot.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "doctorHot@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "doctorHot@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot.png new file mode 100644 index 0000000..568c73e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot@2x.png new file mode 100644 index 0000000..ea88b58 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot@3x.png new file mode 100644 index 0000000..f979185 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorHot.imageset/doctorHot@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorNoImage.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorNoImage.imageset/Contents.json new file mode 100644 index 0000000..42fdf9d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorNoImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "doctorNoImage.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorNoImage.imageset/doctorNoImage.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorNoImage.imageset/doctorNoImage.png new file mode 100644 index 0000000..62ee9cc Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/doctorNoImage.imageset/doctorNoImage.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/Contents.json new file mode 100644 index 0000000..f4cfc78 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "endQuestionItem.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "endQuestionItem@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "endQuestionItem@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem.png new file mode 100644 index 0000000..6082e54 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem@2x.png new file mode 100644 index 0000000..dd5b3a6 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem@3x.png new file mode 100644 index 0000000..34afa38 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/endQuestionItem.imageset/endQuestionItem@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.imageset/Contents.json new file mode 100644 index 0000000..fbd3d74 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "eye.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.imageset/eye.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.imageset/eye.png new file mode 100644 index 0000000..2d22fbb Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.imageset/eye.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.slash.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.slash.imageset/Contents.json new file mode 100644 index 0000000..a28350a --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.slash.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "eye.slash.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.slash.imageset/eye.slash.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.slash.imageset/eye.slash.png new file mode 100644 index 0000000..ed4d56b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/eye.slash.imageset/eye.slash.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/Contents.json new file mode 100644 index 0000000..41271ae --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "firstStep_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "firstStep_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "firstStep_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon.png new file mode 100644 index 0000000..df8a533 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon@2x.png new file mode 100644 index 0000000..607bbbf Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon@3x.png new file mode 100644 index 0000000..6053c13 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/firstStep_icon.imageset/firstStep_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/Contents.json new file mode 100644 index 0000000..cddcf1b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "foundDoctor.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "foundDoctor@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "foundDoctor@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor.png new file mode 100644 index 0000000..44b9062 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor@2x.png new file mode 100644 index 0000000..68c7f7e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor@3x.png new file mode 100644 index 0000000..b2f1adf Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/foundDoctor.imageset/foundDoctor@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/Contents.json new file mode 100644 index 0000000..3b400dc --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "garyDown.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "garyDown@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "garyDown@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown.png new file mode 100644 index 0000000..dc499d1 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown@2x.png new file mode 100644 index 0000000..462650f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown@3x.png new file mode 100644 index 0000000..3d5f72d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyDown.imageset/garyDown@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/Contents.json new file mode 100644 index 0000000..0a8fff7 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "garyRight.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "garyRight@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "garyRight@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight.png new file mode 100644 index 0000000..7ae571b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight@2x.png new file mode 100644 index 0000000..50f8ae4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight@3x.png new file mode 100644 index 0000000..2cbe786 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/garyRight.imageset/garyRight@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/Contents.json new file mode 100644 index 0000000..8d2a6c1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "heard_man.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "heard_man@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "heard_man@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man.png new file mode 100644 index 0000000..4ac9c77 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man@2x.png new file mode 100644 index 0000000..1846f5f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man@3x.png new file mode 100644 index 0000000..ae465fe Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_man.imageset/heard_man@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/Contents.json new file mode 100644 index 0000000..43ad165 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "heard_woman.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "heard_woman@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "heard_woman@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman.png new file mode 100644 index 0000000..dd92f57 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman@2x.png new file mode 100644 index 0000000..f0b74c9 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman@3x.png new file mode 100644 index 0000000..2b03312 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/heard_woman.imageset/heard_woman@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/Contents.json new file mode 100644 index 0000000..8d51a27 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "home_star.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_star@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_star@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star.png new file mode 100644 index 0000000..5abec7c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star@2x.png new file mode 100644 index 0000000..945595e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star@3x.png new file mode 100644 index 0000000..2054b82 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/home_star.imageset/home_star@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/Contents.json new file mode 100644 index 0000000..b7bbfde --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "homestar_gray.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "homestar_gray@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "homestar_gray@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray.png new file mode 100644 index 0000000..ba83fe5 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray@2x.png new file mode 100644 index 0000000..3387381 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray@3x.png new file mode 100644 index 0000000..53f7871 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/homestar_gray.imageset/homestar_gray@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/Contents.json new file mode 100644 index 0000000..a328960 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "hospatilAddress.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "hospatilAddress@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "hospatilAddress@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress.png new file mode 100644 index 0000000..e2ea61e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress@2x.png new file mode 100644 index 0000000..a0c5886 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress@3x.png new file mode 100644 index 0000000..f1331e3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospatilAddress.imageset/hospatilAddress@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospitalNoimage.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospitalNoimage.imageset/Contents.json new file mode 100644 index 0000000..0fb3e96 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospitalNoimage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "hospitalNoimage.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospitalNoimage.imageset/hospitalNoimage.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospitalNoimage.imageset/hospitalNoimage.png new file mode 100644 index 0000000..5bd0b65 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospitalNoimage.imageset/hospitalNoimage.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospital_location.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospital_location.imageset/Contents.json new file mode 100644 index 0000000..8d39da8 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospital_location.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "hospital_location@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospital_location.imageset/hospital_location@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospital_location.imageset/hospital_location@2x.png new file mode 100644 index 0000000..bf4684b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/hospital_location.imageset/hospital_location@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_archives.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_archives.imageset/Contents.json new file mode 100644 index 0000000..f6af7cb --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_archives.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_more_archives.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_archives.imageset/ic_more_archives.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_archives.imageset/ic_more_archives.png new file mode 100644 index 0000000..2338427 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_archives.imageset/ic_more_archives.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_info.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_info.imageset/Contents.json new file mode 100644 index 0000000..97d5172 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_info.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_more_info.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_info.imageset/ic_more_info.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_info.imageset/ic_more_info.png new file mode 100644 index 0000000..3106f7b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_info.imageset/ic_more_info.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_location.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_location.imageset/Contents.json new file mode 100644 index 0000000..17eb02c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_location.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_more_location.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_location.imageset/ic_more_location.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_location.imageset/ic_more_location.png new file mode 100644 index 0000000..9600b12 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_location.imageset/ic_more_location.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_medical_examination_report.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_medical_examination_report.imageset/Contents.json new file mode 100644 index 0000000..831c3aa --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_medical_examination_report.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_more_medical_examination_report.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_medical_examination_report.imageset/ic_more_medical_examination_report.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_medical_examination_report.imageset/ic_more_medical_examination_report.png new file mode 100644 index 0000000..3e1b78f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/ic_more_medical_examination_report.imageset/ic_more_medical_examination_report.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/Contents.json new file mode 100644 index 0000000..6a2d1f2 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "line_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "line_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "line_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected.png new file mode 100644 index 0000000..326d906 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected@2x.png new file mode 100644 index 0000000..e99276e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected@3x.png new file mode 100644 index 0000000..0735530 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/line_selected.imageset/line_selected@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/Contents.json new file mode 100644 index 0000000..c54e646 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "filename" : "loginBtn_img.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "loginBtn_img@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/loginBtn_img.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/loginBtn_img.png new file mode 100644 index 0000000..c9688a3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/loginBtn_img.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/loginBtn_img@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/loginBtn_img@2x.png new file mode 100644 index 0000000..024b129 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginBtn_img.imageset/loginBtn_img@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/Contents.json new file mode 100644 index 0000000..79aafd9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "loginCenterImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "loginCenterImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "loginCenterImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg.png new file mode 100644 index 0000000..4997501 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg@2x.png new file mode 100644 index 0000000..53628a8 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg@3x.png new file mode 100644 index 0000000..e87a31a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginCenterImg.imageset/loginCenterImg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/Contents.json new file mode 100644 index 0000000..67b29ec --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "loginTitleImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "loginTitleImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "loginTitleImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg.png new file mode 100644 index 0000000..147608d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg@2x.png new file mode 100644 index 0000000..e378da1 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg@3x.png new file mode 100644 index 0000000..d025037 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitleImg.imageset/loginTitleImg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/Contents.json new file mode 100644 index 0000000..d8a85d6 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "loginTitle_Img.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "loginTitle_Img@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "loginTitle_Img@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img.png new file mode 100644 index 0000000..147608d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img@2x.png new file mode 100644 index 0000000..e378da1 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img@3x.png new file mode 100644 index 0000000..d025037 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTitle_Img.imageset/loginTitle_Img@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/Contents.json new file mode 100644 index 0000000..2aa9155 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "loginTopBackImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "loginTopBackImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "loginTopBackImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg.png new file mode 100644 index 0000000..63196ee Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg@2x.png new file mode 100644 index 0000000..cadf065 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg@3x.png new file mode 100644 index 0000000..40327cf Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBackImg.imageset/loginTopBackImg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/Contents.json new file mode 100644 index 0000000..93d983d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "loginTopBimg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "loginTopBimg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "loginTopBimg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg.png new file mode 100644 index 0000000..63196ee Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg@2x.png new file mode 100644 index 0000000..cadf065 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg@3x.png new file mode 100644 index 0000000..40327cf Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/loginTopBimg.imageset/loginTopBimg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/Contents.json new file mode 100644 index 0000000..96cc44e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "login_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "login_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "login_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon.png new file mode 100644 index 0000000..4997501 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon@2x.png new file mode 100644 index 0000000..53628a8 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon@3x.png new file mode 100644 index 0000000..e87a31a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_icon.imageset/login_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/Contents.json new file mode 100644 index 0000000..dbb1e13 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "login_nomalProtocol.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "login_nomalProtocol@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "login_nomalProtocol@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol.png new file mode 100644 index 0000000..db26201 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol@2x.png new file mode 100644 index 0000000..a5bfdf8 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol@3x.png new file mode 100644 index 0000000..ef76142 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_nomalProtocol.imageset/login_nomalProtocol@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/Contents.json new file mode 100644 index 0000000..e31b498 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "login_selectProtocol.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "login_selectProtocol@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "login_selectProtocol@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol.png new file mode 100644 index 0000000..1534e52 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol@2x.png new file mode 100644 index 0000000..d9d0447 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol@3x.png new file mode 100644 index 0000000..f0861e6 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/login_selectProtocol.imageset/login_selectProtocol@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/merchatAddImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/merchatAddImg.imageset/Contents.json new file mode 100644 index 0000000..a8da059 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/merchatAddImg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "merchatAddImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/merchatAddImg.imageset/merchatAddImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/merchatAddImg.imageset/merchatAddImg@2x.png new file mode 100644 index 0000000..012ac42 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/merchatAddImg.imageset/merchatAddImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/Contents.json new file mode 100644 index 0000000..22daf08 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "tabbar_mine_normal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_mine_normal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_mine_normal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal.png new file mode 100644 index 0000000..6a20a63 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal@2x.png new file mode 100644 index 0000000..faeac61 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal@3x.png new file mode 100644 index 0000000..5948f9e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_normal.imageset/tabbar_mine_normal@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/Contents.json new file mode 100644 index 0000000..57e22c6 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "tabbar_mine_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "tabbar_mine_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "tabbar_mine_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected.png new file mode 100644 index 0000000..030ac96 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected@2x.png new file mode 100644 index 0000000..734ed87 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected@3x.png new file mode 100644 index 0000000..3d21d51 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mine_selected.imageset/tabbar_mine_selected@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/Contents.json new file mode 100644 index 0000000..3ad2c98 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mustKnow_Nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mustKnow_Nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mustKnow_Nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal.png new file mode 100644 index 0000000..9b6b46c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal@2x.png new file mode 100644 index 0000000..cdfc51b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal@3x.png new file mode 100644 index 0000000..5ac3a3e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Nomal.imageset/mustKnow_Nomal@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/Contents.json new file mode 100644 index 0000000..da007a3 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mustKnow_Selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mustKnow_Selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mustKnow_Selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected.png new file mode 100644 index 0000000..8ba8a9e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected@2x.png new file mode 100644 index 0000000..83ad1fe Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected@3x.png new file mode 100644 index 0000000..3fcf38c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/mustKnow_Selected.imageset/mustKnow_Selected@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/Contents.json new file mode 100644 index 0000000..49d2c93 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "myQuestion.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "myQuestion@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "myQuestion@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion.png new file mode 100644 index 0000000..c047b3b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion@2x.png new file mode 100644 index 0000000..996110d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion@3x.png new file mode 100644 index 0000000..1f516dc Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestion.imageset/myQuestion@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/Contents.json new file mode 100644 index 0000000..e5b9ae9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "myQuestionHome.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "myQuestionHome@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "myQuestionHome@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome.png new file mode 100644 index 0000000..80ce74a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome@2x.png new file mode 100644 index 0000000..2856201 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome@3x.png new file mode 100644 index 0000000..4b7b517 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/myQuestionHome.imageset/myQuestionHome@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/Contents.json new file mode 100644 index 0000000..4931e9f --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "nearbyHospitalImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "nearbyHospitalImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "nearbyHospitalImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg.png new file mode 100644 index 0000000..f8ae1e4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg@2x.png new file mode 100644 index 0000000..9bfa0e1 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg@3x.png new file mode 100644 index 0000000..5764c80 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nearbyHospitalImg.imageset/nearbyHospitalImg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/Contents.json new file mode 100644 index 0000000..a4a7527 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "noData.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "noData@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "noData@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData.png new file mode 100644 index 0000000..1968cec Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData@2x.png new file mode 100644 index 0000000..01c2288 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData@3x.png new file mode 100644 index 0000000..9b5c093 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noData.imageset/noData@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/Contents.json new file mode 100644 index 0000000..c272944 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "noDataBox.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "noDataBox@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "noDataBox@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox.png new file mode 100644 index 0000000..c1e73db Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox@2x.png new file mode 100644 index 0000000..71f7dd0 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox@3x.png new file mode 100644 index 0000000..874e155 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noDataBox.imageset/noDataBox@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/Contents.json new file mode 100644 index 0000000..59bc3fc --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "noQuetionList.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "noQuetionList@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "noQuetionList@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList.png new file mode 100644 index 0000000..6b1bfc2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList@2x.png new file mode 100644 index 0000000..0eea055 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList@3x.png new file mode 100644 index 0000000..fabf5d5 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/noQuetionList.imageset/noQuetionList@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/Contents.json new file mode 100644 index 0000000..1265bc1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "nomalDetailHeard.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "nomalDetailHeard@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "nomalDetailHeard@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard.png new file mode 100644 index 0000000..5127c34 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard@2x.png new file mode 100644 index 0000000..4abd288 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard@3x.png new file mode 100644 index 0000000..23a37e3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/nomalDetailHeard.imageset/nomalDetailHeard@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/Contents.json new file mode 100644 index 0000000..77b5d80 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "peoplexiugai.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "peoplexiugai@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "peoplexiugai@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai.png new file mode 100644 index 0000000..48b4595 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai@2x.png new file mode 100644 index 0000000..8c6ace6 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai@3x.png new file mode 100644 index 0000000..7f7fc51 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/peoplexiugai.imageset/peoplexiugai@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/Contents.json new file mode 100644 index 0000000..d0924d1 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "physcialType_nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "physcialType_nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "physcialType_nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal.png new file mode 100644 index 0000000..9b6b46c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal@2x.png new file mode 100644 index 0000000..cdfc51b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal@3x.png new file mode 100644 index 0000000..5ac3a3e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_nomal.imageset/physcialType_nomal@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/Contents.json new file mode 100644 index 0000000..7103dca --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "physcialType_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "physcialType_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "physcialType_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected.png new file mode 100644 index 0000000..8ba8a9e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected@2x.png new file mode 100644 index 0000000..83ad1fe Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected@3x.png new file mode 100644 index 0000000..3fcf38c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/physcialType_selected.imageset/physcialType_selected@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/Contents.json new file mode 100644 index 0000000..3ffc957 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "pictureQuestion_Left.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "pictureQuestion_Left@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "pictureQuestion_Left@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left.png new file mode 100644 index 0000000..a1ecb14 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left@2x.png new file mode 100644 index 0000000..4a4f864 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left@3x.png new file mode 100644 index 0000000..e74e101 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureQuestion_Left.imageset/pictureQuestion_Left@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/Contents.json new file mode 100644 index 0000000..ba33ad7 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "pictureTypeIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "pictureTypeIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "pictureTypeIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon.png new file mode 100644 index 0000000..ca76451 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon@2x.png new file mode 100644 index 0000000..4f59024 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon@3x.png new file mode 100644 index 0000000..326865a Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/pictureTypeIcon.imageset/pictureTypeIcon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/Contents.json new file mode 100644 index 0000000..14d342d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "popChoose_normal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "popChoose_normal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "popChoose_normal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal.png new file mode 100644 index 0000000..6829bf6 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal@2x.png new file mode 100644 index 0000000..c259c4b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal@3x.png new file mode 100644 index 0000000..e4aa77f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_normal.imageset/popChoose_normal@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/Contents.json new file mode 100644 index 0000000..fee3c3e --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "popChoose_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "popChoose_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "popChoose_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected.png new file mode 100644 index 0000000..29d3077 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected@2x.png new file mode 100644 index 0000000..2e69b64 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected@3x.png new file mode 100644 index 0000000..8bedfa0 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/popChoose_selected.imageset/popChoose_selected@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/Contents.json new file mode 100644 index 0000000..a080fd0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "questionDetailBack.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "questionDetailBack@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "questionDetailBack@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack.png new file mode 100644 index 0000000..84ccda7 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack@2x.png new file mode 100644 index 0000000..a30a513 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack@3x.png new file mode 100644 index 0000000..d921dd2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionDetailBack.imageset/questionDetailBack@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/Contents.json new file mode 100644 index 0000000..e1fd2b3 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "questionHeardBack.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "questionHeardBack@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "questionHeardBack@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack.png new file mode 100644 index 0000000..df95be2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack@2x.png new file mode 100644 index 0000000..922c46e Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack@3x.png new file mode 100644 index 0000000..b5f3cd2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionHeardBack.imageset/questionHeardBack@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/Contents.json new file mode 100644 index 0000000..111cb94 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "questionLeft_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "questionLeft_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "questionLeft_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon.png new file mode 100644 index 0000000..7fd6343 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon@2x.png new file mode 100644 index 0000000..c884a0d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon@3x.png new file mode 100644 index 0000000..82f0ffe Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionLeft_icon.imageset/questionLeft_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/Contents.json new file mode 100644 index 0000000..2f9bb7b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "questionTitleImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "questionTitleImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "questionTitleImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg.png new file mode 100644 index 0000000..b1cdcb9 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg@2x.png new file mode 100644 index 0000000..81fbb76 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg@3x.png new file mode 100644 index 0000000..984171f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/questionTitleImg.imageset/questionTitleImg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/Contents.json new file mode 100644 index 0000000..6655d90 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "recordStatusIng.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "recordStatusIng@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "recordStatusIng@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng.png new file mode 100644 index 0000000..5e5d16c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng@2x.png new file mode 100644 index 0000000..c29803c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng@3x.png new file mode 100644 index 0000000..5c4f2b6 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordStatusIng.imageset/recordStatusIng@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/Contents.json new file mode 100644 index 0000000..4e0cbff --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "recordsStatusEnd.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "recordsStatusEnd@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "recordsStatusEnd@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd.png new file mode 100644 index 0000000..3e1bb64 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd@2x.png new file mode 100644 index 0000000..28f73bf Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd@3x.png new file mode 100644 index 0000000..efcb3b3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/recordsStatusEnd.imageset/recordsStatusEnd@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/Contents.json new file mode 100644 index 0000000..7482e44 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "repay_Icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "repay_Icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "repay_Icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon.png new file mode 100644 index 0000000..269f7d4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon@2x.png new file mode 100644 index 0000000..17d0fb9 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon@3x.png new file mode 100644 index 0000000..d62990d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/repay_Icon.imageset/repay_Icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/report_navRight.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/report_navRight.imageset/Contents.json new file mode 100644 index 0000000..3b445f0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/report_navRight.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "report_navRight.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/report_navRight.imageset/report_navRight.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/report_navRight.imageset/report_navRight.png new file mode 100644 index 0000000..c398016 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/report_navRight.imageset/report_navRight.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/Contents.json new file mode 100644 index 0000000..8393396 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "roomPlaceholder.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "roomPlaceholder@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "roomPlaceholder@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder.png new file mode 100644 index 0000000..a72ba58 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder@2x.png new file mode 100644 index 0000000..bf9750f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder@3x.png new file mode 100644 index 0000000..4a91b05 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder 1.imageset/roomPlaceholder@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/Contents.json new file mode 100644 index 0000000..8393396 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "roomPlaceholder.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "roomPlaceholder@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "roomPlaceholder@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder.png new file mode 100644 index 0000000..a72ba58 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder@2x.png new file mode 100644 index 0000000..bf9750f Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder@3x.png new file mode 100644 index 0000000..4a91b05 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomPlaceholder.imageset/roomPlaceholder@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/Contents.json new file mode 100644 index 0000000..139ab13 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "roomTopImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "roomTopImg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "roomTopImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg.png new file mode 100644 index 0000000..1ca2c08 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg@2x.png new file mode 100644 index 0000000..50ad2ec Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg@3x.png new file mode 100644 index 0000000..8018d9d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/roomTopImg.imageset/roomTopImg@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/Contents.json new file mode 100644 index 0000000..3bd40db --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "samllAssistant.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "samllAssistant@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "samllAssistant@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant.png new file mode 100644 index 0000000..f04872d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant@2x.png new file mode 100644 index 0000000..b4c883d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant@3x.png new file mode 100644 index 0000000..6ff97da Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/samllAssistant.imageset/samllAssistant@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/sangedian.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/sangedian.imageset/Contents.json new file mode 100644 index 0000000..2d042f4 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/sangedian.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "sangedian.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/sangedian.imageset/sangedian.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/sangedian.imageset/sangedian.png new file mode 100644 index 0000000..edb2426 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/sangedian.imageset/sangedian.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/Contents.json new file mode 100644 index 0000000..39e898f --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "searchLeftIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "searchLeftIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "searchLeftIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon.png new file mode 100644 index 0000000..3aa8b34 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon@2x.png new file mode 100644 index 0000000..5668126 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon@3x.png new file mode 100644 index 0000000..105084d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/searchLeftIcon.imageset/searchLeftIcon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/Contents.json new file mode 100644 index 0000000..af64e1f --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "secondStep_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "secondStep_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "secondStep_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon.png new file mode 100644 index 0000000..6a52b97 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon@2x.png new file mode 100644 index 0000000..30e33f2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon@3x.png new file mode 100644 index 0000000..38d341c Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/secondStep_icon.imageset/secondStep_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/Contents.json new file mode 100644 index 0000000..1be0609 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "statusTop_nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "statusTop_nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "statusTop_nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal.png new file mode 100644 index 0000000..ea1e63d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal@2x.png new file mode 100644 index 0000000..b73462b Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal@3x.png new file mode 100644 index 0000000..28bcc0d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/statusTop_nomal.imageset/statusTop_nomal@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/topBackImg.imageset/20240708-103523.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/topBackImg.imageset/20240708-103523.png new file mode 100644 index 0000000..b5f50f2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/topBackImg.imageset/20240708-103523.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/topBackImg.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/topBackImg.imageset/Contents.json new file mode 100644 index 0000000..7e9b096 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/topBackImg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "20240708-103523.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/Contents.json new file mode 100644 index 0000000..28461f0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "videQuestion_Left.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "videQuestion_Left@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "videQuestion_Left@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left.png new file mode 100644 index 0000000..56bdd70 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left@2x.png new file mode 100644 index 0000000..96224e2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left@3x.png new file mode 100644 index 0000000..badd7e7 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left 1.imageset/videQuestion_Left@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/Contents.json new file mode 100644 index 0000000..28461f0 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "videQuestion_Left.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "videQuestion_Left@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "videQuestion_Left@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left.png new file mode 100644 index 0000000..56bdd70 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left@2x.png new file mode 100644 index 0000000..96224e2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left@3x.png new file mode 100644 index 0000000..badd7e7 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videQuestion_Left.imageset/videQuestion_Left@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/Contents.json new file mode 100644 index 0000000..42f8e1c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "videoTypeIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "videoTypeIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "videoTypeIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon.png new file mode 100644 index 0000000..33a30e2 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon@2x.png new file mode 100644 index 0000000..fc49291 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon@3x.png new file mode 100644 index 0000000..84f3c09 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/videoTypeIcon.imageset/videoTypeIcon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/Contents.json new file mode 100644 index 0000000..5a15efd --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "waitEveal_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "waitEveal_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "waitEveal_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon.png new file mode 100644 index 0000000..8dc5c2d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon@2x.png new file mode 100644 index 0000000..001de1d Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon@3x.png new file mode 100644 index 0000000..e41afc4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/waitEveal_icon.imageset/waitEveal_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/Contents.json new file mode 100644 index 0000000..88b6088 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "whiteBack_icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "whiteBack_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "whiteBack_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon.png new file mode 100644 index 0000000..212fc79 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon@2x.png new file mode 100644 index 0000000..79f2a20 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon@3x.png new file mode 100644 index 0000000..6b842dc Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/whiteBack_icon.imageset/whiteBack_icon@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/Contents.json new file mode 100644 index 0000000..235e770 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "blackLeftAccow.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "blackLeftAccow@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "blackLeftAccow@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow.png new file mode 100644 index 0000000..a2ac4d8 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow@2x.png new file mode 100644 index 0000000..6e550e3 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow@3x.png new file mode 100644 index 0000000..c2ba6a4 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackLeftAccow.imageset/blackLeftAccow@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/Contents.json new file mode 100644 index 0000000..af0a28a --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "blackRightAccow.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "blackRightAccow@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "blackRightAccow@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow.png new file mode 100644 index 0000000..22df803 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow@2x.png new file mode 100644 index 0000000..7c6e744 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow@3x.png new file mode 100644 index 0000000..76ddb13 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Monitoring/blackRightAccow.imageset/blackRightAccow@3x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/Contents.json new file mode 100644 index 0000000..a4a7527 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "noData.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "noData@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "noData@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData.png new file mode 100644 index 0000000..1968cec Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData@2x.png new file mode 100644 index 0000000..01c2288 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData@2x.png differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData@3x.png new file mode 100644 index 0000000..9b5c093 Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/other/noData.imageset/noData@3x.png differ diff --git a/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRBaseView.m b/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRBaseView.m index 5ffa09d..732e26c 100644 --- a/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRBaseView.m +++ b/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRBaseView.m @@ -11,7 +11,7 @@ @interface BRBaseView () // 蒙层视图 -@property (nonatomic, strong) UIView *maskView; +@property (nonatomic, strong) UIView *backgroundMaskView; // 标题栏背景视图 @property (nonatomic, strong) UIView *titleBarView; // 左边取消按钮 @@ -36,7 +36,13 @@ self.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; if (!self.pickerStyle.hiddenMaskView) { - [self addSubview:self.maskView]; +// [self addSubview:self.maskView]; + if (self.backgroundMaskView && self.backgroundMaskView != self) { + if (self.backgroundMaskView.superview) { + [self.backgroundMaskView removeFromSuperview]; + } + [self addSubview:self.backgroundMaskView]; + } } [self addSubview:self.alertView]; @@ -104,17 +110,18 @@ } #pragma mark - 蒙层视图 -- (UIView *)maskView { - if (!_maskView) { - _maskView = [[UIView alloc]initWithFrame:self.keyView.bounds]; - _maskView.backgroundColor = self.pickerStyle.maskColor; +- (UIView *)backgroundMaskView { + if (!_backgroundMaskView) { + _backgroundMaskView = [[UIView alloc]initWithFrame:self.keyView.bounds]; + _backgroundMaskView.backgroundColor = self.pickerStyle.maskColor; // 设置子视图的大小随着父视图变化 - _maskView.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; - _maskView.userInteractionEnabled = YES; + _backgroundMaskView.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + _backgroundMaskView.userInteractionEnabled = YES; UITapGestureRecognizer *myTap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(didTapMaskView:)]; - [_maskView addGestureRecognizer:myTap]; + [_backgroundMaskView addGestureRecognizer:myTap]; } - return _maskView; + //_maskView + return _backgroundMaskView; } #pragma mark - 弹框视图 diff --git a/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRPickerStyle.m b/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRPickerStyle.m index fa8600c..8749e3d 100644 --- a/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRPickerStyle.m +++ b/XinjiangProject/XinjiangProject/ThirdParty/BRPickerView/Base/BRPickerStyle.m @@ -192,7 +192,7 @@ - (CGRect)doneBtnFrame { if (CGRectEqualToRect(_doneBtnFrame, CGRectZero) || _doneBtnFrame.size.height == 0) { - _doneBtnFrame = CGRectMake(BRGetKeyWindow().bounds.size.width - 60 - 5, 8, 60, 28); + _doneBtnFrame = CGRectMake(BRGetKeyWindow().bounds.size.width - 80 - 5, 8, 80, 28); } return _doneBtnFrame; } diff --git a/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.h b/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.h index 43dc6db..61bd6bc 100644 --- a/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.h +++ b/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.h @@ -1,6 +1,6 @@ // // MQTextField.h -// EscortProject +// XinjiangProject // // Created by Apple on 2024/5/7. // diff --git a/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.m b/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.m index ca4c2d4..8b2f50d 100644 --- a/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.m +++ b/XinjiangProject/XinjiangProject/ThirdParty/MQTextField.m @@ -1,6 +1,6 @@ // // MQTextField.m -// EscortProject +// XinjiangProject // // Created by Apple on 2024/5/7. // diff --git a/XinjiangProject/XinjiangProject/Utils/XLCircle.h b/XinjiangProject/XinjiangProject/Utils/XLCircle.h index 046feb5..40cdc48 100644 --- a/XinjiangProject/XinjiangProject/Utils/XLCircle.h +++ b/XinjiangProject/XinjiangProject/Utils/XLCircle.h @@ -1,6 +1,6 @@ // // XLCircle.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/13. // diff --git a/XinjiangProject/XinjiangProject/Utils/XLCircle.m b/XinjiangProject/XinjiangProject/Utils/XLCircle.m index 081561b..dc746e2 100644 --- a/XinjiangProject/XinjiangProject/Utils/XLCircle.m +++ b/XinjiangProject/XinjiangProject/Utils/XLCircle.m @@ -1,6 +1,6 @@ // // XLCircle.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/13. // diff --git a/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.h b/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.h index a270e06..3ff9ce8 100644 --- a/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.h +++ b/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.h @@ -1,6 +1,6 @@ // // XLCircleProgress.h -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/13. // diff --git a/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.m b/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.m index 4325b9c..d63a920 100644 --- a/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.m +++ b/XinjiangProject/XinjiangProject/Utils/XLCircleProgress.m @@ -1,6 +1,6 @@ // // XLCircleProgress.m -// EscortProject +// XinjiangProject // // Created by 仁康信息 on 2023/12/13. //