From 0ffc7ba2b2789248d86577db2a3b90792eddabd1 Mon Sep 17 00:00:00 2001 From: History <2596007731@qq.com> Date: Mon, 14 Jul 2025 10:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=98=E5=B7=A5=E7=AB=AF?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XinjiangProject.xcodeproj/project.pbxproj | 32 +- .../XinjiangProject/Define/StatusMacros.h | 2 +- .../XinjiangProject/Define/ThirdMacros.h | 2 +- .../XinjiangProject/Define/YYUtilsMacros.h | 4 +- .../JKCQNetworkingWithCache.m | 30 + .../AppDelegate/AppDelegate+AppService.m | 17 +- .../Project/Base/HQBaseTabBarController.m | 8 +- .../XJLoginFoundPasswordViewController.m | 31 +- .../Login/XJLoginViewController.m | 19 +- .../Controller/XJAddContactViewController.m | 8 +- .../XJEmergencyListViewController.h | 16 + .../XJEmergencyListViewController.m | 229 +++++++ .../XJMinePictureRecordViewController.m | 28 +- .../XJMineQuestionRecordViewController.m | 13 + .../XJMineVideoRecordViewController.h | 1 + .../XJMineVideoRecordViewController.m | 10 +- .../Controller/XJMyCenterViewController.m | 7 +- .../XJSOSDetailSmallSumViewController.m | 71 ++- .../MainCenter/View/XJMyCenterHeardView.m | 63 +- .../MainCenter/View/XJMyCenterTableView.m | 21 +- .../View/XJSOSDoctorTableViewCell.m | 43 +- .../MonitoringDetailViewController.h | 2 + .../MonitoringDetailViewController.m | 4 +- .../Controller/MonitoringHistoryController.m | 6 +- .../MonitoringWarchViewController.m | 161 ++++- .../View/MonitoringWatchTableViewCell.h | 2 +- .../View/MonitoringWatchTableViewCell.m | 2 +- .../Controller/HospitalMainViewController.m | 8 +- .../QuestionMustKnowViewController.m | 64 +- .../Controller/QuestionPeopleMangerVC.m | 38 +- .../Controller/QuestionViewController.m | 79 ++- .../XJAudioVideoRecordViewController.m | 2 +- .../Qusetion/Controller/RoomDoctorRecordsVC.m | 2 +- .../MainSearchViewController.m | 4 +- .../SearchZhuangJiaViewController.m | 4 +- .../Controller/SelectedDoctorTimeVC.m | 40 +- .../SelectedQuestionViewController.m | 8 +- .../Controller/XJAddQuestionViewController.m | 6 +- .../Controller/XJDoctorMainViewController.m | 2 +- ...ler.h => XJEvaluationListViewController.h} | 4 +- ...ler.m => XJEvaluationListViewController.m} | 8 +- ...troller.h => XJExpertMainViewController.h} | 4 +- ...troller.m => XJExpertMainViewController.m} | 78 +-- ...ler.h => XJFileDataDetailViewController.h} | 4 +- ...ler.m => XJFileDataDetailViewController.m} | 8 +- .../Project/Qusetion/View/DoctorInfoTopView.m | 36 +- .../Qusetion/View/HealthyQuestionHeardView.m | 16 +- .../View/QuestionDiseaseTableViewCell.m | 8 +- .../Controller/XJSosCenterViewController.m | 560 ++++++------------ .../Project/SOS/Model/XJSOSCenterModel.h | 1 + .../Project/SOS/View/XJSOSAddressView.m | 61 +- .../Project/TUIChat/ChatViewController.m | 27 +- .../DoctorCardCell/DoctiorIDCardCellData.m | 2 +- .../DoctorCardCell/DoctorIDCardMessageCell.m | 22 +- .../AppIcon.appiconset/Contents.json | 3 + .../AppIcon.appiconset/健康油我 1.png | Bin 0 -> 55224 bytes .../AppIcon.appiconset/健康油我 2.png | Bin 0 -> 55224 bytes .../AppIcon.appiconset/健康油我.png | Bin 0 -> 55224 bytes .../tabbar_homepage_normal_icon.png | Bin 588 -> 0 bytes .../tabbar_homepage_normal_icon@2x.png | Bin 967 -> 0 bytes .../tabbar_homepage_normal_icon@3x.png | Bin 1339 -> 0 bytes .../20250703-134619.png | Bin 0 -> 2015 bytes .../Contents.json | 4 +- .../SOS/decrease.imageset/Contents.json | 21 + .../SOS/decrease.imageset/decrease@2x.png | Bin 0 -> 296 bytes .../SOS/gpsStat1.imageset/Contents.json | 21 + .../SOS/gpsStat1.imageset/gpsStat1@2x.png | Bin 0 -> 489 bytes .../SOS/increase.imageset/Contents.json | 21 + .../SOS/increase.imageset/increase@2x.png | Bin 0 -> 317 bytes .../Assets.xcassets/Tabbar/Contents.json | 6 + .../mineTabBar_nomal.imageset/Contents.json | 23 + .../mineTabBar_nomal.png | Bin 0 -> 949 bytes .../mineTabBar_nomal@2x.png | Bin 0 -> 1931 bytes .../mineTabBar_nomal@3x.png | Bin 0 -> 4815 bytes .../Contents.json | 23 + .../mineTabBar_selected.png | Bin 0 -> 1211 bytes .../mineTabBar_selected@2x.png | Bin 0 -> 1910 bytes .../mineTabBar_selected@3x.png | Bin 0 -> 5831 bytes .../Contents.json | 23 + .../monitoringTabbar_nomal.png | Bin 0 -> 1019 bytes .../monitoringTabbar_nomal@2x.png | Bin 0 -> 2089 bytes .../monitoringTabbar_nomal@3x.png | Bin 0 -> 5040 bytes .../Contents.json | 23 + .../monitoringTabbar_selected.png | Bin 0 -> 1084 bytes .../monitoringTabbar_selected@2x.png | Bin 0 -> 2109 bytes .../monitoringTabbar_selected@3x.png | Bin 0 -> 5642 bytes .../Contents.json | 23 + .../questionTabBar_nomal.png | Bin 0 -> 998 bytes .../questionTabBar_nomal@2x.png | Bin 0 -> 1847 bytes .../questionTabBar_nomal@3x.png | Bin 0 -> 4890 bytes .../Contents.json | 23 + .../questionTabBar_selected.png | Bin 0 -> 1205 bytes .../questionTabBar_selected@2x.png | Bin 0 -> 1931 bytes .../questionTabBar_selected@3x.png | Bin 0 -> 5753 bytes .../Contents.json | 23 + .../sosCenterTabar_nomal.png | Bin 0 -> 992 bytes .../sosCenterTabar_nomal@2x.png | Bin 0 -> 1558 bytes .../sosCenterTabar_nomal@3x.png | Bin 0 -> 4216 bytes .../Contents.json | 23 + .../sosCenterTabar_selected.png | Bin 0 -> 1135 bytes .../sosCenterTabar_selected@2x.png | Bin 0 -> 1592 bytes .../sosCenterTabar_selected@3x.png | Bin 0 -> 4900 bytes .../close_icon.imageset/Contents.json | 23 + .../close_icon.imageset/close_icon.png | Bin 0 -> 372 bytes .../close_icon.imageset/close_icon@2x.png | Bin 0 -> 695 bytes .../close_icon.imageset/close_icon@3x.png | Bin 0 -> 1163 bytes .../gpsStat1.imageset/Contents.json | 21 + .../gpsStat1.imageset/gpsStat1@2x.png | Bin 0 -> 489 bytes .../XinjiangProject/Utils/JXIDNumTextField.h | 13 + .../XinjiangProject/Utils/JXIDNumTextField.m | 53 ++ .../XinjiangProject/Utils/PaddingLabel.h | 18 + .../XinjiangProject/Utils/PaddingLabel.m | 30 + 112 files changed, 1576 insertions(+), 770 deletions(-) create mode 100644 XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h create mode 100644 XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m rename XinjiangProject/XinjiangProject/Project/Qusetion/Controller/{EvaluationListViewController.h => XJEvaluationListViewController.h} (75%) rename XinjiangProject/XinjiangProject/Project/Qusetion/Controller/{EvaluationListViewController.m => XJEvaluationListViewController.m} (97%) rename XinjiangProject/XinjiangProject/Project/Qusetion/Controller/{ExpertMainViewController.h => XJExpertMainViewController.h} (69%) rename XinjiangProject/XinjiangProject/Project/Qusetion/Controller/{ExpertMainViewController.m => XJExpertMainViewController.m} (94%) rename XinjiangProject/XinjiangProject/Project/Qusetion/Controller/{FileDataDetailViewController.h => XJFileDataDetailViewController.h} (61%) rename XinjiangProject/XinjiangProject/Project/Qusetion/Controller/{FileDataDetailViewController.m => XJFileDataDetailViewController.m} (93%) create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我 1.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我 2.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我.png delete mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon.png delete mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@2x.png delete mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/tabbar_homepage_normal_icon@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/emergency_icon.imageset/20250703-134619.png rename XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/{Question_normal_icon.imageset => emergency_icon.imageset}/Contents.json (61%) create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/decrease@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/gpsStat1.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/gpsStat1.imageset/gpsStat1@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/increase@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/mineTabBar_nomal.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/mineTabBar_nomal@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/mineTabBar_nomal@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_selected.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_selected.imageset/mineTabBar_selected.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_selected.imageset/mineTabBar_selected@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_selected.imageset/mineTabBar_selected@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_selected.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_selected.imageset/monitoringTabbar_selected.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_selected.imageset/monitoringTabbar_selected@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_selected.imageset/monitoringTabbar_selected@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_nomal.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_nomal.imageset/sosCenterTabar_nomal.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_nomal.imageset/sosCenterTabar_nomal@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_nomal.imageset/sosCenterTabar_nomal@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_selected.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_selected.imageset/sosCenterTabar_selected.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_selected.imageset/sosCenterTabar_selected@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_selected.imageset/sosCenterTabar_selected@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon@2x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon@3x.png create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/gpsStat1.imageset/Contents.json create mode 100644 XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/gpsStat1.imageset/gpsStat1@2x.png create mode 100755 XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.h create mode 100755 XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.m create mode 100644 XinjiangProject/XinjiangProject/Utils/PaddingLabel.h create mode 100644 XinjiangProject/XinjiangProject/Utils/PaddingLabel.m diff --git a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj index 4983310..197292b 100644 --- a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj +++ b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj @@ -381,15 +381,15 @@ GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch"; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/XinjiangProject/Supporting Files/Info.plist"; - INFOPLIST_KEY_CFBundleDisplayName = "新疆亚克西"; + INFOPLIST_KEY_CFBundleDisplayName = "健康油我"; INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; - INFOPLIST_KEY_NSCameraUsageDescription = "健康咨询员工端需要访问您的相机用来档案功能,是否同意？"; - INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的定位服务，否则可能无法使用。"; - INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的定位服务，否则可能无法使用。"; - INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的定位服务，否则可能无法使用。"; - INFOPLIST_KEY_NSMicrophoneUsageDescription = "健康咨询员工端需要访问您的麦克风用来视频录制，是否同意？"; - INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "新疆员工端需要访问您的相册上传图片，方便您的使用，是否同意？"; - INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "健康咨询想使用您的相册功能 是否同意？"; + INFOPLIST_KEY_NSCameraUsageDescription = "健康油我需要访问您的相机用来档案功能,是否同意？"; + INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "健康油我需要您的定位服务，否则可能无法使用。"; + INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "健康油我需要您的定位服务，否则可能无法使用。"; + INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "健康油我需要您的定位服务，否则可能无法使用。"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "健康油我需要访问您的麦克风用来视频录制，是否同意？"; + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "健康油我需要访问您的相册上传图片，方便您的使用，是否同意？"; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "健康油我想使用您的相册功能 是否同意？"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; @@ -425,15 +425,15 @@ GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch"; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/XinjiangProject/Supporting Files/Info.plist"; - INFOPLIST_KEY_CFBundleDisplayName = "新疆亚克西"; + INFOPLIST_KEY_CFBundleDisplayName = "健康油我"; INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; - INFOPLIST_KEY_NSCameraUsageDescription = "健康咨询员工端需要访问您的相机用来档案功能,是否同意？"; - INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "APP需要您的定位服务，否则可能无法使用。"; - INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "APP需要您的定位服务，否则可能无法使用。"; - INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "APP需要您的定位服务，否则可能无法使用。"; - INFOPLIST_KEY_NSMicrophoneUsageDescription = "健康咨询员工端需要访问您的麦克风用来视频录制，是否同意？"; - INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "新疆员工端需要访问您的相册上传图片，方便您的使用，是否同意？"; - INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "健康咨询想使用您的相册功能 是否同意？"; + INFOPLIST_KEY_NSCameraUsageDescription = "健康油我需要访问您的相机用来档案功能,是否同意？"; + INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "健康油我需要您的定位服务，否则可能无法使用。"; + INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "健康油我需要您的定位服务，否则可能无法使用。"; + INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "健康油我需要您的定位服务，否则可能无法使用。"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "健康油我需要访问您的麦克风用来视频录制，是否同意？"; + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "健康油我需要访问您的相册上传图片，方便您的使用，是否同意？"; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "健康油我想使用您的相册功能 是否同意？"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; diff --git a/XinjiangProject/XinjiangProject/Define/StatusMacros.h b/XinjiangProject/XinjiangProject/Define/StatusMacros.h index f8d7f20..e0e14b4 100755 --- a/XinjiangProject/XinjiangProject/Define/StatusMacros.h +++ b/XinjiangProject/XinjiangProject/Define/StatusMacros.h @@ -86,7 +86,7 @@ #define H5DevHost @"xjgateway.mcrm.vip:8888"// #define IntervenH5 @"https://xjconsole.mcrm.vip:8888" #define BASEURL @"https://yyjk.cqygjk.com" //北边接口前缀 -#define SCHEME @"http" // +#define SCHEME @"https" // diff --git a/XinjiangProject/XinjiangProject/Define/ThirdMacros.h b/XinjiangProject/XinjiangProject/Define/ThirdMacros.h index 5323188..2a809fd 100755 --- a/XinjiangProject/XinjiangProject/Define/ThirdMacros.h +++ b/XinjiangProject/XinjiangProject/Define/ThirdMacros.h @@ -25,7 +25,7 @@ //高德key -#define AMAPSDKKEY @"e5e5b1aa469fcf577c829165bae860dd" +#define AMAPSDKKEY @"59c99e428ea0ea0086d1e1bd7ab2ca6b" #define KNotificAgreeProtoocl @"AGREEPMAP" diff --git a/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h b/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h index 9156fed..dafc93e 100755 --- a/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h +++ b/XinjiangProject/XinjiangProject/Define/YYUtilsMacros.h @@ -184,10 +184,12 @@ 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 ValidStr(f) StrValid(f) + #define SafeStr(f) (!StrValid(f) ? f:@"-") #define HasString(str,key) ([str rangeOfString:key].location!=NSNotFound) -#define ValidStr(f) StrValid(f) #define ValidDict(f) (f!=nil && [f isKindOfClass:[NSDictionary class]]) #define ValidArray(f) (f!=nil && [f isKindOfClass:[NSArray class]] && [f count]>0) #define ValidNum(f) (f!=nil && [f isKindOfClass:[NSNumber class]]) diff --git a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQNetworkingWithCache.m b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQNetworkingWithCache.m index 8dba942..ffea220 100755 --- a/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQNetworkingWithCache.m +++ b/XinjiangProject/XinjiangProject/Manager/NetworkHelpManager/JKCQNetworkingWithCache.m @@ -142,6 +142,15 @@ typedef NS_ENUM(NSInteger, RequestType) { if (![self requestBeforeJudgeConnect]) {//断网 [self showError:@"请检查网络设置"]; DYLog(@"\n\n----%@------\n\n",@"没有网络"); + UIWindow *keyWindow = UIApplication.sharedApplication.windows.firstObject; + for (UIWindow *window in UIApplication.sharedApplication.windows) { + if (window.isKeyWindow) { + keyWindow = window; + break; + } + } + + [MBProgressHUD hideHUDForView:keyWindow animated:YES]; return; } @@ -188,8 +197,18 @@ typedef NS_ENUM(NSInteger, RequestType) { }else { NSLog(@"%@",url); + UIWindow *keyWindow = UIApplication.sharedApplication.windows.firstObject; + for (UIWindow *window in UIApplication.sharedApplication.windows) { + if (window.isKeyWindow) { + keyWindow = window; + break; + } + } + + [MBProgressHUD hideHUDForView:keyWindow animated:YES]; [self showError:@"网络服务出错"]; } + // } @@ -218,6 +237,17 @@ typedef NS_ENUM(NSInteger, RequestType) { } else { + + NSLog(@"%@",url); + UIWindow *keyWindow = UIApplication.sharedApplication.windows.firstObject; + for (UIWindow *window in UIApplication.sharedApplication.windows) { + if (window.isKeyWindow) { + keyWindow = window; + break; + } + } + + [MBProgressHUD hideHUDForView:keyWindow animated:YES]; [self showError:@"网络服务出错"]; } diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m index 7b5bf97..e87694a 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate+AppService.m @@ -52,12 +52,21 @@ object:nil]; if ([HQCommonUtils isLogin]) { //腾讯im - JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; - [proctocolApi GetIMLoginAccount:nil]; +#if DEBUG +// [self loginImAccount]; + +#else + [self loginImAccount]; + +#endif + } } - +- (void)loginImAccount { + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; + [proctocolApi GetIMLoginAccount:nil]; +} #pragma mark ————— 初始化window ————— -(void)initWindow{ @@ -230,7 +239,7 @@ paragraphStyle.alignment = NSTextAlignmentLeft; - NSMutableAttributedString *message = [[NSMutableAttributedString alloc] initWithString:@"\n亲，感谢您对健康咨询员工端一直以来的信任！我们依据最新的监管要求更新了健康咨询员工端《隐私权政策》，特向您说明如下\n1.为向您提供交易相关基本功能，我们会收集、使用必要的信息；\n2.基于您的明示授权，我们可能会获取您的位置（为您提供服务）等信息，您有权拒绝或取消授权；\n3.我们会采取业界先进的安全措施保护您的信息安全；\n4.未经您同意，我们不会从第三方处获取、共享或向提供您的信息；" attributes:@{ + NSMutableAttributedString *message = [[NSMutableAttributedString alloc] initWithString:@"\n亲，感谢您对健康油我一直以来的信任！我们依据最新的监管要求更新了健康油我《隐私权政策》，特向您说明如下\n1.为向您提供交易相关基本功能，我们会收集、使用必要的信息；\n2.基于您的明示授权，我们可能会获取您的位置（为您提供服务）等信息，您有权拒绝或取消授权；\n3.我们会采取业界先进的安全措施保护您的信息安全；\n4.未经您同意，我们不会从第三方处获取、共享或向提供您的信息；" attributes:@{ NSParagraphStyleAttributeName:paragraphStyle, }]; diff --git a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m b/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m index 533a057..d16e6f6 100644 --- a/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m +++ b/XinjiangProject/XinjiangProject/Project/Base/HQBaseTabBarController.m @@ -74,18 +74,18 @@ _VCS = @[].mutableCopy; QuestionViewController * questionVC = [[QuestionViewController alloc]init]; - [self setupChildViewController:questionVC title:@"咨询" imageName:@"Question_normal_icon" seleceImageName:@"Question_selected_icon"]; + [self setupChildViewController:questionVC title:@"咨询" imageName:@"questionTabBar_nomal" seleceImageName:@"questionTabBar_selected"]; XJSosCenterViewController * sosVC = [[XJSosCenterViewController alloc]init]; - [self setupChildViewController:sosVC title:@"就医" imageName:@"Question_normal_icon" seleceImageName:@"Question_selected_icon"]; + [self setupChildViewController:sosVC title:@"应急" imageName:@"sosCenterTabBar_nomal" seleceImageName:@"sosCenterTabBar_selected"]; MonitoringWarchViewController * jianceVC = [[MonitoringWarchViewController alloc]init]; - [self setupChildViewController:jianceVC title:@"监测" imageName:@"Question_normal_icon" seleceImageName:@"Question_selected_icon"]; + [self setupChildViewController:jianceVC title:@"监测" imageName:@"monitoringTabBar_nomal" seleceImageName:@"monitoringTabBar_selected"]; XJMyCenterViewController * centerVC = [[XJMyCenterViewController alloc] init]; - [self setupChildViewController:centerVC title:@"我的" imageName:@"mine_normal" seleceImageName:@"mine_selected"]; + [self setupChildViewController:centerVC title:@"我的" imageName:@"mineTabBar_nomal" seleceImageName:@"mineTabBar_selected"]; self.viewControllers = _VCS; diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m index 2efe4ac..6ea84d9 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginFoundPasswordViewController.m @@ -7,15 +7,13 @@ #import "XJLoginFoundPasswordViewController.h" #import "XJLoginSetPasswordViewController.h" -#import "LVKeyboard.h" -#import "MQTextField.h" -@interface XJLoginFoundPasswordViewController () +#import "JXIDNumTextField.h" +@interface XJLoginFoundPasswordViewController () @property (nonatomic, strong)UITextField * nameTextFild; @property (nonatomic, strong)UITextField * phoneTextFild; -@property (nonatomic, strong)MQTextField * codeTextFild; +@property (nonatomic, strong)JXIDNumTextField * codeTextFild; @property (nonatomic, strong)UIButton * codeButton; -@property (nonatomic, strong) LVKeyboard *keyboard; @end @@ -33,10 +31,6 @@ - (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; @@ -76,12 +70,11 @@ [codeLeft addSubview:codeLabel]; - self.codeTextFild = [[MQTextField alloc] initWithFrame:CGRectMake(0, self.nameTextFild.bottom+1, kScreenWidth, kRealValue(50))]; + self.codeTextFild = [[JXIDNumTextField 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.delegate = self; self.codeTextFild.leftView = codeLeft; self.codeTextFild.leftViewMode = UITextFieldViewModeAlways; [topView addSubview:self.codeTextFild]; @@ -179,24 +172,12 @@ if(textField == self.codeTextFild) { - self.codeTextFild.inputView = self.keyboard; +// 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 diff --git a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m index 4f3f8df..e039e52 100644 --- a/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Login_Register/Login/XJLoginViewController.m @@ -116,6 +116,7 @@ UIView * leftview = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 20, 40)]; self.userNameField.leftView = leftview; self.userNameField.leftViewMode = UITextFieldViewModeAlways; + self.userNameField.autocapitalizationType = UITextAutocapitalizationTypeNone; [loginView addSubview:accountField ]; // // @@ -402,15 +403,15 @@ [[NSUserDefaults standardUserDefaults] synchronize]; NSString * avatar = @""; NSString * placeholdImg ; - if (!ValidStr(user.avatar)) { + if (!ValidStr(user.avatar) && ![user.avatar isEqualToString:ResourceAddress]) { avatar = user.avatar; }else { if ([user.sex_dictText isEqualToString:@"女"]) { - placeholdImg = @"heard_man"; + placeholdImg = @"heard_woman"; }else { - placeholdImg = @"heard_woman"; + placeholdImg = @"heard_man"; } } if (ValidStr(user.personType) || [user.personType intValue] != 1 ) { @@ -423,8 +424,14 @@ [[NSUserDefaults standardUserDefaults] synchronize]; KPostNotification(KNotificationLoginStateChange, @YES); - //登录im - [self loginImAccount]; +#if DEBUG + [self loginImAccount]; + + +#else + [self loginImAccount]; + +#endif } if ([tag isEqualToString:@"IMAPI"]) { @@ -435,7 +442,7 @@ IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; iminfoModel.IMInfo = pamrDic; [HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; - + // 1. 从即时通信 IM 控制台获取应用 SDKAppID。 // 2. 初始化 config 对象 diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m index 568afaf..abd4e97 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJAddContactViewController.m @@ -59,6 +59,7 @@ [self.view addSubview:self.nameField]; //手机号 self.phoneField = [self createFieldWithLeftTitle:@"手机号" withRightString:@" " placeholderStr:@"请填写手机号" isShowRight:true]; + self.phoneField.keyboardType = UIKeyboardTypeNumberPad; self.phoneField.frame = CGRectMake(0, self.nameField.bottom, kScreenWidth, 51); [self.view addSubview:self.phoneField]; //身份证号码， @@ -215,7 +216,10 @@ FamilyMemberRelationModel * model = [FamilyMemberRelationModel modelWithDictionary:dic] ; - [self.memberArray addObject:model]; + if(![model.title isEqualToString:@"本人"]) { + [self.memberArray addObject:model]; + + } } } if ([tag isEqualToString:@"ADDAPI"]) { @@ -236,6 +240,8 @@ - (void)relastionShipOnclick { + [self.view endEditing:YES]; + /// 1.单列字符串选择器（传字符串数组） BRStringPickerView *stringPickerView = [[BRStringPickerView alloc]init]; stringPickerView.pickerMode = BRStringPickerComponentSingle; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h new file mode 100644 index 0000000..937610d --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.h @@ -0,0 +1,16 @@ +// +// XJEmergencyListViewController.h +// XinjiangProject +// +// Created by Apple on 2025/7/3. +// + +#import "HQBaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XJEmergencyListViewController : HQBaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m new file mode 100644 index 0000000..6a391dd --- /dev/null +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJEmergencyListViewController.m @@ -0,0 +1,229 @@ +// +// XJEmergencyListViewController.m +// XinjiangProject +// +// Created by Apple on 2025/7/3. +// + +#import "XJEmergencyListViewController.h" +#import "XJEmergencyContactModel.h" +#import "XJAddContactViewController.h" + +@interface XJEmergencyListViewController () + +@property (nonatomic, strong) UITableView * homeTable; + +@property (nonatomic, strong) NSMutableArray * dataArray; + +@end + +@implementation XJEmergencyListViewController + +- (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 = UIColorHex(#EFEFEF); + self.isHidenNaviBar = false; + self.navigationItem.title = @"紧急联系人"; + [self addNavigationItemWithTitles:@[@"新增"] isLeft:false target:self action:@selector(addEmergencyContact) tags:@[@1]]; + [self createUI]; + //请求紧急联系人 + [self.dataArray removeAllObjects]; + [self getEmergencyContact]; +} + + +- (void)viewWillAppear:(BOOL)animated { + + [super viewWillAppear:animated]; + + [self.homeTable.mj_header beginRefreshing]; + +} + +- (void)createUI { + + self.homeTable = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight) style:UITableViewStylePlain]; + if ([[UIDevice currentDevice].systemVersion floatValue] >= 11) { + self.homeTable.estimatedRowHeight = 0; + self.homeTable.estimatedSectionFooterHeight = 0; + self.homeTable.estimatedSectionHeaderHeight = 0; + if (@available(iOS 15.0, *)) { + self.homeTable.sectionHeaderTopPadding = 0; + } else { + // Fallback on earlier versions + } + self.homeTable.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + } + self.homeTable.delegate = self; + self.homeTable.dataSource = self; + self.homeTable.separatorStyle = UITableViewCellSeparatorStyleSingleLine; + self.homeTable.showsVerticalScrollIndicator = NO; + self.homeTable.sectionHeaderHeight = 0; + self.homeTable.sectionFooterHeight = 0; + self.homeTable.contentInset = UIEdgeInsetsZero; + self.homeTable.contentOffset = CGPointZero; + self.homeTable.backgroundColor = KClearColor; + [self.view addSubview:self.homeTable]; + + __weak __typeof(self) weakSelf = self; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + + [weakSelf.dataArray removeAllObjects]; + [self getEmergencyContact]; + + }]; + + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noDataBox" 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; + +} + +#pragma mark:新增联系人 +- (void)addEmergencyContact { + + XJAddContactViewController * addVC = [[XJAddContactViewController alloc] init]; + + [self.navigationController pushViewController:addVC animated:YES]; + +} +//请求紧急联系人 +- (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.homeTable.mj_header endRefreshing]; + [self showMBProgressHUDOnlyWithString:message]; + [self hiddenAllMBProgressHUD]; + +} +- (void)Sucess:(id)response tag:(NSString*)tag +{ + [self hiddenAllMBProgressHUD]; + + + if ([tag isEqualToString:@"ContactAPI"]) { + + [self.homeTable.mj_header endRefreshing]; + + NSArray * array = response; + [self.dataArray removeAllObjects]; + for (NSDictionary * parmDic in array) { + + XJEmergencyContactModel * model = [XJEmergencyContactModel modelWithDictionary:parmDic]; + + [self.dataArray addObject:model]; + + } + [self.homeTable reloadData]; + } +} + +#pragma mark - DataSource +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + + return self.dataArray.count; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return 1; + +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + + + XJEmergencyContactModel * model = self.dataArray[indexPath.row]; + + + static NSString * cellID = @"cellID"; + + UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CONNETCELL"]; + + if (!cell) { + + cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"CONNETCELL"]; + } + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + cell.textLabel.font = SYSTEMFONT(14); + cell.textLabel.text = [NSString stringWithFormat:@"%@-%@",model.name,model.phone]; + cell.detailTextLabel.text = model.familyRelation_dictText; + return cell; + + +} + +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + + + return 45; +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + XJEmergencyContactModel * model = self.dataArray[indexPath.row]; + XJAddContactViewController * addVC = [[XJAddContactViewController alloc] init]; + addVC.model = model; + [self.navigationController pushViewController:addVC animated:YES]; + +} + +- (CGFloat )tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return CGFLOAT_MIN; +} + +- (CGFloat )tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return CGFLOAT_MIN; +} + +- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section { + + return UIView.new; +} + + + +/* +#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.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m index 4bd2fa6..9e2c0b8 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMinePictureRecordViewController.m @@ -95,7 +95,6 @@ self.isHidenNaviBar = false; self.pageNo = 0; - [self createUI]; if ([ESCTUIManager TUIUserStatus] == false) { @@ -107,17 +106,17 @@ { [self getChatList]; } - else - { - [self createData]; - } +// else +// { +// [self createData]; +// } } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - + [self.dataArray removeAllObjects]; [self.homeTable.mj_header beginRefreshing]; @@ -149,16 +148,8 @@ 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 ) { + if (index == 1 ) { listBtn.selected = YES; listBtn.backgroundColor = UIColorHex(#21BEBD); }else{ @@ -258,7 +249,7 @@ [weakSelf createData]; } }]; - LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noDataBox" titleStr:@"暂无数据" detailStr:@""]; //元素竖直方向的间距 emptyView.subViewMargin = 20.f; //标题颜色 @@ -484,10 +475,11 @@ - (void)setSelectOnes:(NSInteger)selectOnes { _selectOnes = selectOnes; - self.type = [NSString stringWithFormat:@"%ld",_selectOnes]; +// self.type = [NSString stringWithFormat:@"%ld",_selectOnes]; switch (_selectOnes) { case 3://进行中 { + self.type = @"3"; for (UIButton * seleBtn in self.buttonArray) { if (seleBtn.tag == 1000) { seleBtn.selected = YES; @@ -503,6 +495,7 @@ break; case 5://已评价 { + self.type = @"5"; for (UIButton * seleBtn in self.buttonArray) { if (seleBtn.tag == 1001) { seleBtn.selected = YES; @@ -518,6 +511,7 @@ break; case 6: { + self.type = @""; for (UIButton * seleBtn in self.buttonArray) { if (seleBtn.tag == 1002) { seleBtn.selected = YES; diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m index c455b95..cdd53fd 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineQuestionRecordViewController.m @@ -22,6 +22,9 @@ /** 按钮数组 */ @property (nonatomic, strong) NSMutableArray *titleButtons; +@property (nonatomic, strong) XJMineVideoRecordViewController * videoVC; + + @end @implementation XJMineQuestionRecordViewController @@ -79,7 +82,9 @@ // XJMineVideoRecordViewController * videoVc = [[XJMineVideoRecordViewController alloc] init]; videoVc.navigationItem.title = @"视频咨询"; + videoVc.isSlected = false; videoVc.selectOnes = self.type; + self.videoVC = videoVc; videoVc.view.backgroundColor = CViewBgColor; [self addChildViewController:videoVc]; @@ -105,6 +110,14 @@ //滚动collectionView 修改偏移量 CGFloat offsetX = i * kScreenWidth; + if (i == 1) { + + self.videoVC.isSlected = true; + }else + { + self.videoVC.isSlected = false; + + } _collectionView.contentOffset = CGPointMake(offsetX, 0); } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h index cc40e2d..341bda0 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.h @@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign) NSInteger selectOnes; +@property (nonatomic, assign) bool isSlected; @end diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m index 06c6d62..cad3f4f 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMineVideoRecordViewController.m @@ -84,14 +84,18 @@ self.pageNo = 0; self.type = [NSString stringWithFormat:@"%ld",_selectOnes]; [self createUI]; - [self createData]; + if (self.isSlected == true) { + [self createData]; + } } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [self.homeTable.mj_header beginRefreshing]; + if (self.isSlected == true) { + [self.homeTable.mj_header beginRefreshing]; + } } @@ -181,7 +185,7 @@ weakSelf.pageNo ++; [weakSelf createData]; }]; - LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noDataBox" titleStr:@"暂无数据" detailStr:@""]; //元素竖直方向的间距 emptyView.subViewMargin = 20.f; //标题颜色 diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m index 2d874e9..34685ee 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJMyCenterViewController.m @@ -16,6 +16,7 @@ #import "XJMineCenterUserModel.h" #import "XJEditSystemViewController.h" #import "XJSOSLookDoctoreViewController.h" +#import "XJEmergencyListViewController.h" @interface XJMyCenterViewController () @@ -168,7 +169,7 @@ - (void)completeEvaluation { XJMineQuestionRecordViewController * recordVC = [[XJMineQuestionRecordViewController alloc] init]; recordVC.titleSelected = 10;//图文视频 - recordVC.type = 4; + recordVC.type = 5; [self.navigationController pushViewController:recordVC animated:YES]; } @@ -201,6 +202,10 @@ case 1: vcToPush = [[XJSOSLookDoctoreViewController alloc] init]; break; + case 2: + vcToPush = [[XJEmergencyListViewController alloc] init]; + break; + default: break; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m index d6a04f6..c99ce26 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/Controller/XJSOSDetailSmallSumViewController.m @@ -12,6 +12,7 @@ @property (nonatomic, strong) UIScrollView * mainScrollview; @property (nonatomic, strong) YYLabel * jingguoLabel; @property (nonatomic, strong) YYLabel * xiaojieLabel; +@property (nonatomic, strong) UILabel * xiaojieTitle; @end @@ -63,11 +64,12 @@ xiaojieTitle.text = @"事件小结"; xiaojieTitle.textColor = CFontColor1; xiaojieTitle.font = BOLDSYSTEMFONT(14); + self.xiaojieTitle = xiaojieTitle; [self.mainScrollview addSubview:xiaojieTitle]; //小结 - self.xiaojieLabel = [[YYLabel alloc] initWithFrame:CGRectMake(kRealValue(13),kRealValue(55), self.mainScrollview.width, 13)]; + self.xiaojieLabel = [[YYLabel alloc] initWithFrame:CGRectMake(kRealValue(13),xiaojieTitle.bottom + kRealValue(31), self.mainScrollview.width, 13)]; self.xiaojieLabel.textAlignment = NSTextAlignmentLeft; self.xiaojieLabel.font = MEDIUMFONT(13); self.xiaojieLabel.textColor = UIColorHex(#333333); @@ -110,44 +112,53 @@ - (void)Sucess:(id)response tag:(NSString*)tag { - if ([tag isEqualToString:@"DETAILAPI"]) { + if ([tag isEqualToString:@"SMALLAPI"]) { NSDictionary * dic = response; if (ValidDict(dic)) { NSString * jingguoString = [dic objectForKey:@"orderThrough"]; NSString * xiaojieString = [dic objectForKey:@"orderResult"]; if (!ValidStr(jingguoString)) { - - - - NSAttributedString *attrStr = [[NSAttributedString alloc] initWithData:[jingguoString dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil]; - self.jingguoLabel.frame = CGRectMake(kRealValue(13),kRealValue(55), self.mainScrollview.width, 13); - // 查询文本排版结果 - // 计算文本尺寸YYTextLayout - CGSize maxSize = CGSizeMake(self.mainScrollview.width, MAXFLOAT); - - YYTextLayout * layout = [YYTextLayout layoutWithContainerSize:maxSize text:self.jingguoLabel.attributedText]; - self.jingguoLabel.textLayout = layout; - CGFloat introHeight = layout.textBoundingSize.height; - // 记录真正的正确高度 - self.jingguoLabel.height = introHeight; + + NSData *data = [jingguoString dataUsingEncoding:NSUnicodeStringEncoding]; + NSDictionary *options = @{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType }; + NSError *error = nil; + NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithData:data + options:options + documentAttributes:nil + error:&error]; + // ✅ 设置字体为13号 + [attrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:13] range:NSMakeRange(0, attrStr.length)]; + + self.jingguoLabel.attributedText = attrStr; + + self.jingguoLabel.frame = CGRectMake(kRealValue(13), kRealValue(55), self.mainScrollview.width, 13); + + CGSize maxSize = CGSizeMake(self.mainScrollview.width, MAXFLOAT); + YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:maxSize text:attrStr]; + self.jingguoLabel.textLayout = layout; + self.jingguoLabel.height = layout.textBoundingSize.height; } if (!ValidStr(xiaojieString)) { //小结 - - NSAttributedString * sumAttrStr = [[NSAttributedString alloc] initWithData:[xiaojieString dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil]; - self.xiaojieLabel.frame = CGRectMake(kRealValue(13),kRealValue(55), self.mainScrollview.width, 13); - self.xiaojieLabel.attributedText = sumAttrStr; - // 查询文本排版结果 - // 计算文本尺寸YYTextLayout - CGSize maxSize = CGSizeMake(self.mainScrollview.width, MAXFLOAT); - YYTextLayout * sumlayout = [YYTextLayout layoutWithContainerSize:maxSize text:self.xiaojieLabel.attributedText]; - self.xiaojieLabel.textLayout = sumlayout; - CGFloat sumIntroHeight = sumlayout.textBoundingSize.height; - // 记录真正的正确高度 - self.xiaojieLabel.height = sumIntroHeight; - - // 显示文本排版结果 + NSData *data = [xiaojieString dataUsingEncoding:NSUnicodeStringEncoding]; + NSDictionary *options = @{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType }; + NSError *error = nil; + NSMutableAttributedString *sumAttrStr = [[NSMutableAttributedString alloc] initWithData:data + options:options + documentAttributes:nil + error:&error]; + // ✅ 设置字体为13号 + [sumAttrStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:13] range:NSMakeRange(0, sumAttrStr.length)]; + + self.xiaojieTitle.top = self.jingguoLabel.bottom + kRealValue(24); + self.xiaojieLabel.frame = CGRectMake(kRealValue(13), self.xiaojieTitle.bottom + kRealValue(20), self.mainScrollview.width, 13); + self.xiaojieLabel.attributedText = sumAttrStr; + + CGSize maxSize = CGSizeMake(self.mainScrollview.width, MAXFLOAT); + YYTextLayout *sumLayout = [YYTextLayout layoutWithContainerSize:maxSize text:sumAttrStr]; + self.xiaojieLabel.textLayout = sumLayout; + self.xiaojieLabel.height = sumLayout.textBoundingSize.height; } self.mainScrollview.contentSize = CGSizeMake(self.mainScrollview.width, self.xiaojieLabel.bottom + kRealValue(20)); } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m index e1e3f9b..fdb98e6 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterHeardView.m @@ -43,8 +43,9 @@ - (void)createUI { - UIImageView * heardImg = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(26), - kRealValue(16) , 52, 52)]; + UIImageView * heardImg = [[UIImageView alloc] initWithFrame:CGRectMake(kRealValue(26), - kRealValue(16) ,52, 52)]; self.heardImage = heardImg; + self.heardImage.backgroundColor = KClearColor; heardImg.layer.cornerRadius = 26; heardImg.layer.masksToBounds = true; heardImg.userInteractionEnabled = true; @@ -74,27 +75,36 @@ [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))]; + NSArray *array = @[@[@"进行中",@"HeardProgress_icon"], + @[@"待评价",@"waitEveal_icon"], + @[@"已评价",@"alreadyEveal"], + @[@"历史",@"HeardHistory_icon"]]; + + CGFloat imageWidth = kRealValue(58); + NSInteger itemCount = array.count; + CGFloat sideMargin = 12.0; + CGFloat spacingCount = itemCount - 1; + + CGFloat availableWidth = self.width - 2 * sideMargin - itemCount * imageWidth; + CGFloat spacing = availableWidth / spacingCount; + + for (int i = 0; i < itemCount; i++) { + CGFloat x = sideMargin + i * (imageWidth + spacing); + + UIView *heardView = [[UIView alloc] initWithFrame:CGRectMake(x, self.heardImage.bottom + 2, imageWidth, self.height - self.heardImage.bottom - 18)]; [self addSubview:heardView]; - - UIImageView * toolsImg = [[UIImageView alloc] initWithFrame:CGRectMake((heardView.width / 2 - 29 ) , kRealValue(18), w, w)]; + + UIImageView *toolsImg = [[UIImageView alloc] initWithFrame:CGRectMake(heardView.width/2 -imageWidth/2, 15, imageWidth, imageWidth)]; 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)]; + toolsImg.userInteractionEnabled = YES; + + if (i == 0) { + UILabel *numLabel = [[UILabel alloc] initWithFrame:CGRectMake(imageWidth - 16, -2, 18, 18)]; numLabel.text = @"1"; - numLabel.textColor = KWhiteColor; - numLabel.font = SYSTEMFONT(13); + numLabel.textColor = UIColor.whiteColor; + numLabel.font = [UIFont systemFontOfSize:13]; numLabel.textAlignment = NSTextAlignmentCenter; - numLabel.backgroundColor = KRedColor; + numLabel.backgroundColor = UIColor.redColor; numLabel.layer.borderColor = UIColor.whiteColor.CGColor; numLabel.layer.borderWidth = 1.0f; numLabel.layer.cornerRadius = 9.0; @@ -103,22 +113,23 @@ 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); + + UILabel *toolsLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(toolsImg.frame) + 5, imageWidth, 15)]; + toolsLabel.textColor = [UIColor blackColor]; + toolsLabel.font = [UIFont systemFontOfSize:13]; toolsLabel.text = array[i][0]; toolsLabel.textAlignment = NSTextAlignmentCenter; [heardView addSubview:toolsLabel]; - - UIButton * heardBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, heardView.width, 80)]; + + UIButton *heardBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, imageWidth, 80)]; [heardBtn addTarget:self action:@selector(heardToolsAction:) forControlEvents:UIControlEventTouchUpInside]; heardBtn.tag = 100 + i; [heardView addSubview:heardBtn]; - - } + + } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m index f069ab0..0c74645 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJMyCenterTableView.m @@ -72,7 +72,7 @@ - (UIView *)createHeardView { - XJMyCenterHeardView * heardV = [[XJMyCenterHeardView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kRealValue(150))]; + XJMyCenterHeardView * heardV = [[XJMyCenterHeardView alloc] initWithFrame:CGRectMake(kRealValue(15), 0, kScreenWidth - kRealValue(30), kRealValue(150))]; heardV.layer.cornerRadius = 10; heardV.backgroundColor = KWhiteColor; heardV.heardDelegate = self.heardDelegate; @@ -88,7 +88,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 2; + return 3; } - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView @@ -102,7 +102,8 @@ //,@[@"我的关注",@"myLove_icon"] NSArray *sectionOne = @[ @[@"咨询人管理", @"relatives_icon"], - @[@"应急就医", @"medicalReson_icon"] + @[@"应急就医", @"medicalReson_icon"], + @[@"紧急联系人", @"emergency_icon"] ]; static NSString * cellID = @"cellID"; @@ -117,18 +118,8 @@ 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; - } + cell.imageView.image = [UIImage imageNamed: sectionOne[indexPath.row][1]]; + return cell; } diff --git a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m index 43bdf1e..5c85109 100644 --- a/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/MainCenter/View/XJSOSDoctorTableViewCell.m @@ -74,23 +74,24 @@ make.left.mas_offset(15); make.top.mas_equalTo(self.nameLabel.mas_bottom).offset(14); make.height.mas_offset(14); + make.bottom.mas_offset(-20); }]; [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]; +// 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]; @@ -126,7 +127,7 @@ [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.right.mas_offset(-15); - make.top.mas_equalTo(self.lookDetail.mas_bottom).offset(26); + make.top.mas_equalTo(self.lookDetail.mas_bottom).offset(18); make.height.mas_offset(13); }]; @@ -137,12 +138,12 @@ _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]; - } +// if ( ValidStr(_model.sendOrderHospital) ) { +// self.hospitalLabel.text = @"应急医院:"; +// }else +// { +// self.hospitalLabel.text =[NSString stringWithFormat:@"应急医院:%@-%@",_model.sendOrderHospital,_model.stationBusiness_dictText]; +// } self.statusLabel.text = model.orderStatus_dictText; } diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h index f6f716a..2d09cb7 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.h @@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN @interface MonitoringDetailViewController : BaseWebViewVC +@property (nonatomic, strong) NSString * navTitle; + @end NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m index 8de5af1..5137636 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringDetailViewController.m @@ -18,7 +18,7 @@ // Do any additional setup after loading the view. self.view.backgroundColor = CViewBgColor; self.isHidenNaviBar = false; - self.navigationItem.title = @"详情"; + self.navigationItem.title = self.navTitle; [self addNavigationItemWithImageNames:@[@"whiteBack_icon"] isLeft:YES target:self action:@selector(backOnclick) tags:@[@"1"]]; } @@ -29,7 +29,7 @@ - (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation{ [self hiddenAllMBProgressHUD]; - self.navigationItem.title = @"详情";; + self.navigationItem.title = self.navTitle; } diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m index f3562fb..a04d64d 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringHistoryController.m @@ -103,7 +103,7 @@ [weakSelf updateHistoryData:self.currentDate]; }]; - LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noDataBox" titleStr:@"暂无数据" detailStr:@""]; //元素竖直方向的间距 emptyView.subViewMargin = 20.f; //标题颜色 @@ -129,6 +129,7 @@ - (void)updateMonthLabel { NSString *currentMonth = [self getMonthFromDate:self.currentDate]; self.weekLabel.text = currentMonth; // 设置标签显示当前月份 + [self.dataArray removeAllObjects]; [self updateHistoryData:currentMonth]; } @@ -246,6 +247,9 @@ [self.tableView.mj_footer endRefreshing]; NSArray * array = response; + if (self.pageNo == 1) { + [self.dataArray removeAllObjects]; + } for (NSDictionary * dic in array) { MonitoringDataModel * model = [MonitoringDataModel modelWithDictionary:dic]; diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m index d3fc18c..b251c39 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/Controller/MonitoringWarchViewController.m @@ -63,38 +63,39 @@ [self.view addSubview:self.homeTable]; MJWeakSelf - self.homeTable.popBlock = ^(NSString *type) { - if ([type isEqualToString:@"heart_rate"]) { + + self.homeTable.popBlock = ^(MonitoringListDataModel *model) { + if ([model.wdType isEqualToString:@"heart_rate"]) { [weakSelf showPickStringView:BRStringPickerComponentMulti withTitle: @"心率阈值" - withDataArray:@[@[@"40次/分钟", @"45次/分钟", @"50次/分钟"], @[@"100次/分钟",@"110次/分钟",@"120次/分钟",@"130次/分钟",@"140次/分钟",@"150次/分钟"]] withType:type]; + withDataArray:@[@[@"40次/分钟", @"45次/分钟", @"50次/分钟"], @[@"100次/分钟",@"110次/分钟",@"120次/分钟",@"130次/分钟",@"140次/分钟",@"150次/分钟"]] withType:model.wdType withLeft:model.warnMin withRight:model.warnMax]; } - if ([type isEqualToString:@"spo2"]) { + if ([model.wdType isEqualToString:@"spo2"]) { [weakSelf showPickStringView:BRStringPickerComponentSingle - withTitle: @"血氧阈值" - withDataArray:@[@"75%", @"80%", @"85%",@"90%"] withType:type]; + withTitle: @"血氧阈值(下限)" + withDataArray:@[@"75%", @"80%", @"85%",@"90%"] withType:model.wdType withLeft:model.warnMin withRight:model.warnMax]; } - if ([type isEqualToString:@"stress"]) { + if ([model.wdType isEqualToString:@"stress"]) { [weakSelf showPickStringView:BRStringPickerComponentSingle - withTitle: @"压力阈值" - withDataArray:@[@"80", @"81", @"82",@"83",@"84",@"85",@"86",@"87",@"88",@"89",@"90",@"91",@"92",@"93",@"94",@"95",@"96",@"97",@"98",@"99"] withType:type]; + withTitle: @"压力阈值(上限)" + withDataArray:@[@"80", @"81", @"82",@"83",@"84",@"85",@"86",@"87",@"88",@"89",@"90",@"91",@"92",@"93",@"94",@"95",@"96",@"97",@"98",@"99"] withType:model.wdType withLeft:model.warnMin withRight:model.warnMin]; } - if ([type isEqualToString:@"temperature"]) { + if ([model.wdType isEqualToString:@"temperature"]) { [weakSelf showPickStringView:BRStringPickerComponentMulti withTitle: @"体温阈值" withDataArray:@[@[@"34.0℃", @"34.1℃", @"34.2℃",@"34.3℃",@"34.4℃",@"34.5℃",@"34.6℃",@"34.7℃",@"34.8℃",@"34.9℃",@"35.0℃",@"35.1℃",@"35.2℃",@"35.3℃",@"35.4℃",@"35.5℃",@"35.6℃",@"35.7℃",@"35.8℃",@"35.9℃"], - @[@"37.2℃", @"37.3℃", @"37.4℃",@"37.5℃",@"37.6℃",@"37.7℃",@"37.8℃",@"37.9℃",@"38.0℃",@"38.1℃",@"38.2℃",@"38.3℃",@"38.4℃"]] withType:type]; + @[@"37.2℃", @"37.3℃", @"37.4℃",@"37.5℃",@"37.6℃",@"37.7℃",@"37.8℃",@"37.9℃",@"38.0℃",@"38.1℃",@"38.2℃",@"38.3℃",@"38.4℃"]] withType:model.wdType withLeft:model.warnMin withRight:model.warnMax]; } @@ -116,6 +117,12 @@ }; + self.homeTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + + [weakSelf createDetail]; + + }]; + // UIView * warnView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), self.homeTable.bottom + kRealValue(15), kScreenWidth - kRealValue(30), kRealValue(325))]; // warnView.layer.cornerRadius = 10; // warnView.backgroundColor = KWhiteColor; @@ -197,6 +204,7 @@ } - (void)createDetail { + [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; [parmDic setObject:User_ID forKey:@"userId"]; @@ -231,6 +239,8 @@ if ([tag isEqualToString:@"DETAILAPI"]) { + [self hiddenAllMBProgressHUD]; + NSDictionary * dic = response; MonitoringDataModel * model = [MonitoringDataModel modelWithDictionary:dic]; @@ -253,7 +263,24 @@ - (void)showPickStringView:(BRStringPickerMode)stringModel withTitle:(NSString *)title withDataArray:(NSArray *)array - withType:(NSString *)type{ + withType:(NSString *)type + withLeft:(NSString *)leftString + withRight:(NSString *)rightString{ + UIView * customView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 30)]; + + UILabel * leftLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 10, kScreenWidth/2, 20)]; + leftLabel.text = @"下限"; + leftLabel.font = SYSTEMFONT(15); + leftLabel.textAlignment = NSTextAlignmentCenter; + leftLabel.textColor = CFontColor2; + [customView addSubview:leftLabel]; + + UILabel * rightLabel = [[UILabel alloc] initWithFrame:CGRectMake(kScreenWidth/2, 10, kScreenWidth/2, 20)]; + rightLabel.text = @"上限"; + rightLabel.font = SYSTEMFONT(15); + rightLabel.textAlignment = NSTextAlignmentCenter; + rightLabel.textColor = CFontColor2; + [customView addSubview:rightLabel]; /// 多列文本选择器 BRStringPickerView *textPickerView = [[BRStringPickerView alloc]initWithPickerMode:stringModel]; @@ -263,37 +290,102 @@ textPickerView.pickerStyle.doneTextColor = UIColorHex(#21BEBD); // 设置数据源 textPickerView.dataSourceArr = array; - if (stringModel == 0) { - textPickerView.selectIndex =1; + if (stringModel == 0) { //单列 + + NSInteger selectedOnes = 0; + + if ([type isEqualToString:@"spo2"]) { + + for (NSString * dataString in array) { + + if ( [dataString intValue] == [leftString intValue]) { + textPickerView.selectIndex = selectedOnes; + } + selectedOnes ++; + } + } + + if ([type isEqualToString:@"stress"]) { + + for (NSString * dataString in array) { + + if ( [dataString intValue] == [rightString intValue]) { + textPickerView.selectIndex = selectedOnes; + } + selectedOnes ++; + } + } + textPickerView.resultModelBlock = ^(BRResultModel *resultModel) { - - if ([type isEqualToString:@"spo2"]) { - [self settingWithType:type MaxAndMin:@"0" minValue:resultModel.value]; + NSString *valueStr = [self extractNumberFromString:resultModel.value]; + if ([type isEqualToString:@"spo2"]) { + [self settingWithType:type MaxAndMin:@"0" minValue:valueStr]; } if ([type isEqualToString:@"stress"]) { - [self settingWithType:type MaxAndMin:resultModel.value minValue:@"0"]; - + [self settingWithType:type MaxAndMin:valueStr minValue:@"0"]; } - }; - }else { - textPickerView.selectIndexs = @[@1,@1]; + } else { + + [textPickerView addSubViewToPicker:customView]; + + NSInteger selectedLeft = 0; + + for (NSString * dataString in array[0]) { + + if ( [dataString intValue] == [leftString intValue]) { + break; + } + selectedLeft ++; + } + + NSInteger selectedRight = 0; + + for (NSString * dataString in array[1]) { + + if ( [dataString intValue] == [rightString intValue]) { + break; + } + selectedRight ++; + } + textPickerView.selectIndexs = @[@(selectedLeft),@(selectedRight)]; + textPickerView.resultModelArrayBlock = ^(NSArray * _Nullable resultModelArr) { - BRResultModel * resultModel1 = resultModelArr[0]; - BRResultModel * resultModel2 = resultModelArr[1]; - [self settingWithType:type MaxAndMin:resultModel1.value minValue:resultModel2.value]; + BRResultModel *resultModel1 = resultModelArr[1]; + BRResultModel *resultModel2 = resultModelArr[0]; + + NSString *maxValue = [self extractNumberFromString:resultModel1.value]; + NSString *minValue = [self extractNumberFromString:resultModel2.value]; + + [self settingWithType:type MaxAndMin:maxValue minValue:minValue]; }; } + [textPickerView show]; } + +// 提取字符串中的第一个数字（包括小数），例如从 @"34.1m" 提取 @"34.1" +- (NSString *)extractNumberFromString:(NSString *)input { + NSError *error = nil; + NSString *pattern = @"\\d+\\.?\\d*"; // 支持整数和小数 + NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:&error]; + + NSTextCheckingResult *match = [regex firstMatchInString:input options:0 range:NSMakeRange(0, input.length)]; + if (match) { + return [input substringWithRange:match.range]; + } + return @"0"; // 没找到数字时返回默认值 +} + + #pragma mark:设置最大最小值 - (void)settingWithType:(NSString *)type @@ -301,7 +393,8 @@ minValue:(NSString *)min{ NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - [parmDic setObject:User_ID forKey:@"userId"]; + [parmDic setObject:type forKey:@"eventType"]; + [parmDic setObject:User_ID forKey:@"uerId"]; [parmDic setObject:max forKey:@"warnMax"]; [parmDic setObject:min forKey:@"warnMin"]; @@ -321,6 +414,7 @@ detailVC.webUrl = [NSString stringWithFormat:@"%@/static/monitor/index.html?p=%@&r=%@&t=%@&id=%@&d=%@&h=%@#/%@", IntervenH5, @"heartRate", H5DevHost, User_Token, User_ID, time, SCHEME, @"heartRate"]; + detailVC.navTitle = @"心率"; } @@ -329,14 +423,16 @@ detailVC.webUrl = [NSString stringWithFormat:@"%@/static/monitor/index.html?p=%@&r=%@&t=%@&id=%@&d=%@&h=%@#/%@", IntervenH5, @"oxygenSaturation", H5DevHost, User_Token, User_ID, time, SCHEME, @"oxygenSaturation"]; - + detailVC.navTitle = @"血氧饱和度"; + } if ([type isEqualToString:@"stress"]) { detailVC.webUrl = [NSString stringWithFormat:@"%@/static/monitor/index.html?p=%@&r=%@&t=%@&id=%@&d=%@&h=%@#/%@", IntervenH5, @"pressure", H5DevHost, User_Token, User_ID, time, SCHEME, @"pressure"]; - + detailVC.navTitle = @"压力"; + } if ([type isEqualToString:@"temperature"]) { @@ -344,7 +440,8 @@ detailVC.webUrl = [NSString stringWithFormat:@"%@/static/monitor/index.html?p=%@&r=%@&t=%@&id=%@&d=%@&h=%@#/%@", IntervenH5, @"temperature", H5DevHost, User_Token, User_ID, time, SCHEME, @"temperature"]; - + detailVC.navTitle = @"体温"; + } if ([type isEqualToString:@"steps"]) { @@ -352,7 +449,8 @@ detailVC.webUrl = [NSString stringWithFormat:@"%@/static/monitor/index.html?p=%@&r=%@&t=%@&id=%@&d=%@&h=%@#/%@", IntervenH5, @"stepNumber", H5DevHost, User_Token, User_ID, time, SCHEME, @"stepNumber"]; - + detailVC.navTitle = @"步数"; + } if ([type isEqualToString:@"sleep"]) { @@ -360,7 +458,8 @@ detailVC.webUrl = [NSString stringWithFormat:@"%@/static/monitor/index.html?p=%@&r=%@&t=%@&id=%@&d=%@&h=%@#/%@", IntervenH5, @"sleep", H5DevHost, User_Token, User_ID, time, SCHEME, @"sleep"]; - + detailVC.navTitle = @"睡眠"; + } [self.navigationController pushViewController:detailVC animated:YES]; diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h index 58a4b09..d3ccdec 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.h @@ -8,7 +8,7 @@ #import #import "MonitoringDataModel.h" -typedef void(^showPickStringBlock)(NSString * type); +typedef void(^showPickStringBlock)(MonitoringListDataModel * model); typedef void(^showHistoryListBlock)(NSString * type); diff --git a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m index c417c59..769e817 100644 --- a/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Monitoring/View/MonitoringWatchTableViewCell.m @@ -105,7 +105,7 @@ } - (void)popStringPick { - self.popBlock(self.listModel.wdType); + self.popBlock(self.listModel); } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m index d615e58..ed207e6 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/HospitalMainViewController.m @@ -14,10 +14,10 @@ #import "FoundExpertModel.h" #import "EvaluatListModel.h" #import "SearchZhuangJiaViewController.h" -#import "EvaluationListViewController.h" +#import "XJEvaluationListViewController.h" #import "HospitalIntroViewController.h" #import "TYMapNavSheet.h" -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" @interface HospitalMainViewController () { @@ -206,7 +206,7 @@ self.collectView.layer.cornerRadius = 10; self.collectView.layer.masksToBounds = true; self.collectView.collSelectBlock = ^(NSString * _Nonnull doctorID, NSString * _Nonnull doctorName) { - ExpertMainViewController * serarchVC = [[ ExpertMainViewController alloc] init]; + XJExpertMainViewController * serarchVC = [[ XJExpertMainViewController alloc] init]; // serarchVC.departmentId = @""; // serarchVC.departmentName = @""; // serarchVC.sickId = @""; @@ -227,7 +227,7 @@ self.homeTable.layer.cornerRadius = 10; self.homeTable.layer.masksToBounds = true; self.homeTable.moreBlock = ^{ - EvaluationListViewController * evalVC = [[EvaluationListViewController alloc] init]; + XJEvaluationListViewController * evalVC = [[XJEvaluationListViewController alloc] init]; evalVC.hospitalID = weakSelf.hospitalID; [weakSelf.navigationController pushViewController:evalVC animated:YES]; }; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m index 9d7f9c7..4e30380 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionMustKnowViewController.m @@ -136,38 +136,42 @@ NSDictionary * resDic = response; - if ([resDic.allKeys containsObject:@"id"]) { - self.showID = [NSString stringWithFormat:@"%@",resDic[@"id"]]; - } - if ([resDic.allKeys containsObject:@"content"]) { - NSMutableAttributedString *text = [NSMutableAttributedString new]; - // 添加文本 - NSString *title = resDic[@"content"]; - - // //富文本 - // [NSString stringWithFormat:@"%@ ",title]; - NSAttributedString *attrStr = [[NSAttributedString alloc] initWithData:[[NSString stringWithFormat:@"%@ ",title] dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil]; - - [text appendAttributedString:attrStr]; - - NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; - [paragraphStyle setLineSpacing:6]; - [text addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [text length])]; - - self.conntLabel.attributedText = text; + if (ValidDict(resDic)) { - CGSize maxSize = CGSizeMake(self.conntLabel.width, MAXFLOAT); - - YYTextLayout * layout = [YYTextLayout layoutWithContainerSize:maxSize text:self.conntLabel.attributedText]; - self.conntLabel.textLayout = layout; - CGFloat introHeight = layout.textBoundingSize.height; - self.conntLabel.width = maxSize.width; - // 记录真正的正确高度 - self.conntLabel.height = introHeight; - // 显示文本排版结果 - self.mainScrollView.contentSize = CGSizeMake(kScreenWidth - 30, self.conntLabel.bottom); - + if ([resDic.allKeys containsObject:@"id"]) { + self.showID = [NSString stringWithFormat:@"%@",resDic[@"id"]]; + } + + if ([resDic.allKeys containsObject:@"content"]) { + NSMutableAttributedString *text = [NSMutableAttributedString new]; + // 添加文本 + NSString *title = resDic[@"content"]; + + // //富文本 + // [NSString stringWithFormat:@"%@ ",title]; + NSAttributedString *attrStr = [[NSAttributedString alloc] initWithData:[[NSString stringWithFormat:@"%@ ",title] dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil]; + + [text appendAttributedString:attrStr]; + + NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; + [paragraphStyle setLineSpacing:6]; + [text addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [text length])]; + + self.conntLabel.attributedText = text; + + CGSize maxSize = CGSizeMake(self.conntLabel.width, MAXFLOAT); + + YYTextLayout * layout = [YYTextLayout layoutWithContainerSize:maxSize text:self.conntLabel.attributedText]; + self.conntLabel.textLayout = layout; + CGFloat introHeight = layout.textBoundingSize.height; + self.conntLabel.width = maxSize.width; + // 记录真正的正确高度 + self.conntLabel.height = introHeight; + // 显示文本排版结果 + self.mainScrollView.contentSize = CGSizeMake(kScreenWidth - 30, self.conntLabel.bottom); + + } } } if([tag isEqualToString:@"NOTSHOW"]) { diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m index 512064b..40ae40c 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionPeopleMangerVC.m @@ -10,7 +10,7 @@ #import "QuestionPeopleModel.h" #import "SelectedQuestionViewController.h" #import "XJAddQuestionViewController.h" - +#import "XJExpertMainViewController.h" @interface QuestionPeopleMangerVC () @@ -51,10 +51,22 @@ self.isHidenNaviBar = false; self.pageNo = 1; self.navigationItem.title = @"咨询人管理"; + [self addNavigationItemWithImageNames:@[@"whiteBack_icon"] isLeft:YES target:self action:@selector(popToExpertMainViewController) tags:@[@"78"]]; [self createUI]; [self getData]; } +- (void)popToExpertMainViewController { + for (UIViewController *vc in self.navigationController.viewControllers) { + if ([vc isKindOfClass:[XJExpertMainViewController class]]) { + [self.navigationController popToViewController:vc animated:YES]; + return; + } + } + // 如果没找到，可以选择 pop 回根控制器，或做其他处理 + [self.navigationController popToRootViewControllerAnimated:YES]; +} + - (void)createUI { self.homeTable = [[QuestionPeopleManagerTable alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight - SafetyAreaHeight - 45) style:UITableViewStylePlain]; @@ -81,6 +93,22 @@ [weakSelf getData]; }]; + + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noDataBox" 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; + + UIButton * addBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 - kRealValue(140) ,kScreenHeight - kTopHeight - SafetyAreaHeight - 45 , kRealValue(130), 45)]; [addBtn setBackgroundColor:UIColorHex(#21BEBD)]; [addBtn setTitle:@"新增" forState:UIControlStateNormal]; @@ -181,6 +209,14 @@ } DLog(@"%ld",mode.isSelected); } + if(self.dataArray.count == 0) { + [EasyTextView showErrorText:@"暂无联系人"]; + return; + } + if(seleArray.count == 0) { + [EasyTextView showErrorText:@"请选择要删除的联系人"]; + return; + } [self showMBProgressHUDWithString:@"删除中,请稍候..." autoHidden:false]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m index acfc768..e87491e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m @@ -12,7 +12,7 @@ #import "FoundExpertViewController.h" #import "XJDoctorMainViewController.h" #import "DoctorRecommendModel.h" -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" #import "XJQustionRecordViewController.h" #import "ChatViewController.h" #import "QuesstionDetailLookFileViewController.h" @@ -43,6 +43,8 @@ @property (nonatomic, strong) NSMutableArray * dataArray; +@property (nonatomic, strong) HomeQusetionRecordsModel * recomendModel; + @end @implementation QuestionViewController @@ -194,8 +196,8 @@ // var mCheckToken = false // var mCurrentLon = 108.949845 NSUserDefaults * user = [NSUserDefaults standardUserDefaults]; - [user setObject:@(108.949845) forKey:USERDEFAULLONG]; - [user setObject:@(34.327271) forKey:USERDEFAULLATITUDE]; + [user setObject:@(87.627704) forKey:USERDEFAULLONG]; + [user setObject:@(43.793026) forKey:USERDEFAULLATITUDE]; [user synchronize]; return; } @@ -252,7 +254,7 @@ self.homeTable.headDelegate = self; kWeakSelf(self); self.homeTable.tableBlock = ^(HomeQusetionRecordsModel * _Nonnull model) { - + weakself.recomendModel = model; //1图文 2视频 if ([model.contentType intValue] == 2) { @@ -286,7 +288,11 @@ [weakself.navigationController pushViewController:chatVC animated:YES]; }else { - [EasyTextView showErrorText:@"登录过期,请重新登录"]; + if ([HQCommonUtils isLogin]) { + [weakself loginImAccountList]; + + } + } } }; @@ -537,19 +543,14 @@ } if ([tag isEqualToString:@"SMALLHELP"]) { - if ([ESCTUIManager TUIUserStatus] == false) { - - - [self loginImAccount]; - return; - } [self hiddenAllMBProgressHUD]; + SmallHelpIMDataModel * model = [SmallHelpIMDataModel modelWithDictionary:response]; ChatViewController * chatVC = [[ChatViewController alloc] init]; chatVC.isGroupID = YES; chatVC.chatID = model.groupId; chatVC.smallHelp_id = model.small_id; - chatVC.isVideo = YES; + chatVC.isVideo = false; chatVC.eableSendReport = YES; chatVC.eableMapTools = false; chatVC.navTitle = @"全科医生"; @@ -572,6 +573,40 @@ [self smallQuestionAction]; } + if ([tag isEqualToString:@"loginIMList"]) { + [self hiddenAllMBProgressHUD]; + 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]; + + ChatViewController * chatVC = [[ChatViewController alloc] init]; + chatVC.isGroupID = YES; + chatVC.chatID = self.recomendModel.imId ; + chatVC.eableSendReport = true; + chatVC.eablehaveHelathData = false; + chatVC.navTitle = @"图文咨询"; + chatVC.isVideo = NO; + chatVC.pictureEnd_id = self.recomendModel.records_id; + chatVC.questionType = 2; + chatVC.medicalRecordsId = self.recomendModel.memberId; + if ([self.recomendModel.contentStatus intValue] == 5) { + chatVC.isEveal = true; + }else + { + chatVC.isEveal = false; + } + if ([self.recomendModel.contentStatus intValue] >=4 ) { + chatVC.endRecordType = 100; + } + [self.navigationController pushViewController:chatVC animated:YES]; + + } + if ([tag isEqualToString:@"UPVERSION"]) { @@ -656,19 +691,28 @@ } - +#pragma mark:小助手的回调 - (void)loginImAccount { JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; [proctocolApi GetIMLoginAccount:nil]; } +#pragma mark:列表点击回调 + +- (void)loginImAccountList { + + JKCQAPI * proctocolApi = [[JKCQAPI alloc] init:self tag:@"loginIMList" NeedToken:nil]; + [proctocolApi GetIMLoginAccount:nil]; + +} + #pragma mark:医生列表点击事件 - (void)doctorListClick:(NSString *)doctorID { - ExpertMainViewController * mainVC = [[ExpertMainViewController alloc] init]; + XJExpertMainViewController * mainVC = [[XJExpertMainViewController alloc] init]; mainVC.doctorId = doctorID; [self.navigationController pushViewController:mainVC animated:YES]; } @@ -685,6 +729,13 @@ - (void)smallQuestionAction { + if ([ESCTUIManager TUIUserStatus] == false) { + + + [self loginImAccount]; + return; + } + NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; [self showMBProgressHUDWithString:@"咨询中,请稍候..." autoHidden:NO]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m index 18dde8c..e2194d8 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QusetionRecord(咨询记录)/XJAudioVideoRecordViewController.m @@ -118,7 +118,7 @@ [weakSelf createData]; }]; - LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noData" titleStr:@"暂无数据" detailStr:@""]; + LYEmptyView *emptyView = [LYEmptyView emptyViewWithImageStr:@"noDataBox" titleStr:@"暂无数据" detailStr:@""]; //元素竖直方向的间距 emptyView.subViewMargin = 20.f; //标题颜色 diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m index 59c8175..e74709a 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/RoomDoctorRecordsVC.m @@ -130,7 +130,7 @@ //元素竖直方向的间距 emptyView.titleLabMargin = kRealValue(5); - emptyView.contentViewY = kRealValue(450); + emptyView.contentViewY = kRealValue(250); emptyView.imageSize = CGSizeMake(kRealValue(101), kRealValue(60)); //标题颜色 diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m index 650999e..b58eaaa 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/MainSearchViewController.m @@ -15,7 +15,7 @@ #import "SearchZhuangjiaTable.h" #import "SearchZhuangJiaViewController.h" #import "HospitalMainViewController.h" -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" #import "QuestionMustKnowViewController.h" #import "SelectedQuestionViewController.h" #import "SelectedDoctorTimeVC.h" @@ -181,7 +181,7 @@ self.homeTable.mainBlock = ^(NSString * _Nonnull type, NSString * _Nonnull needID) { if ([type isEqualToString:@"医生"]) { - ExpertMainViewController * mainVC = [[ExpertMainViewController alloc] init]; + XJExpertMainViewController * mainVC = [[XJExpertMainViewController alloc] init]; mainVC.doctorId = needID; [weakSelf.navigationController pushViewController:mainVC animated:YES]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m index 8bb6bd0..3f53be7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/Search(搜索页面)/SearchZhuangJiaViewController.m @@ -6,7 +6,7 @@ // #import "SearchZhuangJiaViewController.h" -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" #import "HQSearchView.h" #import "SearchConetShowTable.h" #import "SearchZhuangjiaTable.h" @@ -831,7 +831,7 @@ - (void)zhuangjiaJumpDetail:(NSString *)memberID { - ExpertMainViewController * mainVC = [[ExpertMainViewController alloc] init]; + XJExpertMainViewController * mainVC = [[XJExpertMainViewController alloc] init]; mainVC.doctorId = memberID; [self.navigationController pushViewController:mainVC animated:YES]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m index 2c92c2d..82b2ce0 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedDoctorTimeVC.m @@ -127,10 +127,10 @@ self.collLoveBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth - kRealValue(15) - 60, kRealValue(24), 60, 25)]; - self.collLoveBtn.titleLabel.font = MEDIUMFONT(12); - self.collLoveBtn.layer.cornerRadius = 13.0; - self.collLoveBtn.layer.masksToBounds = true; - [self.collLoveBtn addTarget:self action:@selector(collectHosptal:) forControlEvents:UIControlEventTouchUpInside]; +// self.collLoveBtn.titleLabel.font = MEDIUMFONT(12); +// self.collLoveBtn.layer.cornerRadius = 13.0; +// self.collLoveBtn.layer.masksToBounds = true; +// [self.collLoveBtn addTarget:self action:@selector(collectHosptal:) forControlEvents:UIControlEventTouchUpInside]; [doctView addSubview:self.collLoveBtn]; self.hospitalLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.heardImage.right + kRealValue(18),self.jobLabel.bottom + kRealValue(15) ,kScreenWidth - self.heardImage.right - kRealValue(30), 13)]; @@ -305,22 +305,22 @@ DoctorDetailModel * model = [DoctorDetailModel modelWithDictionary:parmDic]; - if ([model.tfFollow integerValue] == 1) { - [self.collLoveBtn setTitle:@"已关注" forState:UIControlStateNormal]; - [self.collLoveBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; - [self.collLoveBtn setImage:[UIImage imageWithColor:UIColor.grayColor] forState:UIControlStateNormal]; - self.collLoveBtn.backgroundColor = RGBA(221, 221, 221, 1); - self.collLoveBtn.selected = true; - - }else - { - [self.collLoveBtn setTitle:@" 关注" forState:UIControlStateNormal]; - [self.collLoveBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; - [self.collLoveBtn setImage:IMAGE_NAMED(@"collectLove") forState:UIControlStateNormal]; - self.collLoveBtn.backgroundColor = KWhiteColor ; - self.collLoveBtn.selected = false; - - } +// if ([model.tfFollow integerValue] == 1) { +// [self.collLoveBtn setTitle:@"已关注" forState:UIControlStateNormal]; +// [self.collLoveBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; +// [self.collLoveBtn setImage:[UIImage imageWithColor:UIColor.grayColor] forState:UIControlStateNormal]; +// self.collLoveBtn.backgroundColor = RGBA(221, 221, 221, 1); +// self.collLoveBtn.selected = true; +// +// }else +// { +// [self.collLoveBtn setTitle:@" 关注" forState:UIControlStateNormal]; +// [self.collLoveBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; +// [self.collLoveBtn setImage:IMAGE_NAMED(@"collectLove") forState:UIControlStateNormal]; +// self.collLoveBtn.backgroundColor = KWhiteColor ; +// self.collLoveBtn.selected = false; +// +// } self.doctorLabel.text = model.doctorName; self.jobLabel.text = model.doctorTitle; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m index 5c0a4e7..5dccdff 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/SelectedQuestionViewController.m @@ -215,8 +215,14 @@ } } } + + if(self.dataArray.count == 0) { + [EasyTextView showErrorText:@"请先新增咨询人"]; + return; + } + if (ValidStr(upID) || ValidStr(onID)) { - [EasyTextView showErrorText:@"请选择咨询人"]; + [EasyTextView showErrorText:@"请选择或新增咨询人档案"]; return; } diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m index 95eb020..4ca4abd 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJAddQuestionViewController.m @@ -195,9 +195,9 @@ [self.view addSubview:saveBtn]; if (self.questionModel) { - self.baseHelathInfoField.hidden = false; - baseBtn.hidden = false; - tishiLabel.top = self.baseHelathInfoField.bottom + kRealValue(10); + 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]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m index 2e94e56..18040e3 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJDoctorMainViewController.m @@ -15,7 +15,7 @@ #import "LookModficalFileViewController.h" #import "QuesstionDetailLookFileViewController.h" #import "QuestionBodyReportModel.h" -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" #import "evaluationPopView.h" #import "FSXBStarRateView.h" #import "SelectedQuestionViewController.h" diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h similarity index 75% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h index 2b0e26c..8e1faab 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.h @@ -1,5 +1,5 @@ // -// EvaluationListViewController.h +// XJEvaluationListViewController.h // XinjiangProject // // Created by 仁康信息 on 2023/6/14. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface EvaluationListViewController : HQBaseViewController +@interface XJEvaluationListViewController : HQBaseViewController @property (nonatomic, copy) NSString * hospitalID; @property (nonatomic, assign) NSInteger type; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m similarity index 97% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m index 14f3538..926ff50 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/EvaluationListViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJEvaluationListViewController.m @@ -1,17 +1,17 @@ // -// EvaluationListViewController.m +// XJEvaluationListViewController.m // XinjiangProject // // Created by 仁康信息 on 2023/6/14. // -#import "EvaluationListViewController.h" +#import "XJEvaluationListViewController.h" #import "EvaluationListTableView.h" #import "FSXBStarRateView.h" #import "EvaluatListModel.h" -@interface EvaluationListViewController () +@interface XJEvaluationListViewController () @property (nonatomic, assign) NSInteger pageNo; @@ -25,7 +25,7 @@ @end -@implementation EvaluationListViewController +@implementation XJEvaluationListViewController - (NSMutableArray *)dataArray { diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h similarity index 69% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h index 2148615..633aacd 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.h @@ -1,5 +1,5 @@ // -// ExpertMainViewController.h +// XJExpertMainViewController.h // XinjiangProject // // Created by 仁康信息 on 2023/6/16. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface ExpertMainViewController : HQBaseViewController +@interface XJExpertMainViewController : HQBaseViewController @property (nonatomic, copy) NSString * doctorId; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m similarity index 94% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m index fcbfadc..15a8587 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/ExpertMainViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJExpertMainViewController.m @@ -1,24 +1,24 @@ // -// ExpertMainViewController.m +// XJExpertMainViewController.m // XinjiangProject // // Created by 仁康信息 on 2023/6/16. // -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" #import "ZHTagListView.h" #import "HospitalMainTableView.h" -#import "EvaluationListViewController.h" +#import "XJEvaluationListViewController.h" #import "DoctorDetailModel.h" #import "EvaluatListModel.h" #import "DoctorEvaluationTable.h" #import "SelectedDoctorTimeVC.h" -#import "FileDataDetailViewController.h" +#import "XJFileDataDetailViewController.h" #import "SelectFIleDateDetailViewController.h" #import "SelectedQuestionViewController.h" #import "QuestionMustKnowViewController.h" -@interface ExpertMainViewController () +@interface XJExpertMainViewController () @property (nonatomic, strong) UIScrollView * mainScrollView; @@ -60,7 +60,7 @@ @end -@implementation ExpertMainViewController +@implementation XJExpertMainViewController - (void)viewDidLoad { [super viewDidLoad]; @@ -70,8 +70,9 @@ self.view.backgroundColor = UIColorHex(#EEEEEE); [self createUI]; [self createData]; + //1 图文 0 音视频 [self getMustknowWithType:@"1"]; - [self getMustknowWithType:@"2"]; + [self getMustknowWithType:@"0"]; } @@ -147,14 +148,14 @@ [self.topView addSubview:self.hospitalName]; self.collectBtn = [[UIButton alloc] initWithFrame:CGRectMake(kScreenWidth - kRealValue(15) - 60, kRealValue(33), 60, 26)]; - self.collectBtn.backgroundColor = KWhiteColor; - [self.collectBtn setTitle:@" 关注" forState:UIControlStateNormal]; - [self.collectBtn setTitle:@"已关注" forState:UIControlStateSelected]; - self.collectBtn.titleLabel.font = SYSTEMFONT(12); - [self.collectBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; - [self.collectBtn addTarget:self action:@selector(collectHosptal:) forControlEvents:UIControlEventTouchUpInside]; - self.collectBtn.layer.cornerRadius = 13.0; - self.collectBtn.layer.masksToBounds = true; +// self.collectBtn.backgroundColor = KWhiteColor; +// [self.collectBtn setTitle:@" 关注" forState:UIControlStateNormal]; +// [self.collectBtn setTitle:@"已关注" forState:UIControlStateSelected]; +// self.collectBtn.titleLabel.font = SYSTEMFONT(12); +// [self.collectBtn setTitleColor:UIColorHex(#21BEBD) forState:UIControlStateNormal]; +// [self.collectBtn addTarget:self action:@selector(collectHosptal:) forControlEvents:UIControlEventTouchUpInside]; +// self.collectBtn.layer.cornerRadius = 13.0; +// self.collectBtn.layer.masksToBounds = true; [self.topView addSubview:self.collectBtn]; NSMutableArray *_dataSource = @[ @@ -337,7 +338,7 @@ self.homeTable.layer.masksToBounds = true; MJWeakSelf; self.homeTable.moreBlock = ^{ - EvaluationListViewController * evalVC = [[EvaluationListViewController alloc] init]; + XJEvaluationListViewController * evalVC = [[XJEvaluationListViewController alloc] init]; evalVC.doctorId = weakSelf.doctorId; evalVC.type = 2; [weakSelf.navigationController pushViewController:evalVC animated:YES]; @@ -392,18 +393,18 @@ DoctorDetailModel * model = [DoctorDetailModel modelWithDictionary:parmDic]; - if ([model.tfFollow integerValue] == 1) { - - self.collectBtn.selected = YES; - [self.collectBtn setImage:[UIImage imageWithColor:KWhiteColor] forState:UIControlStateNormal]; - - - }else - { - self.collectBtn.selected = NO; - [self.collectBtn setImage:IMAGE_NAMED(@"collectLove") forState:UIControlStateNormal]; - - } +// if ([model.tfFollow integerValue] == 1) { +// +// self.collectBtn.selected = YES; +// [self.collectBtn setImage:[UIImage imageWithColor:KWhiteColor] forState:UIControlStateNormal]; +// +// +// }else +// { +// self.collectBtn.selected = NO; +// [self.collectBtn setImage:IMAGE_NAMED(@"collectLove") forState:UIControlStateNormal]; +// +// } self.doctorName.text = model.doctorName; self.jobName.text = model.doctorTitle; @@ -577,18 +578,21 @@ self.mainScrollView.contentSize = CGSizeMake(kScreenWidth - kRealValue(30), self.homeTable.bottom + kRealValue(30)); } + } + if ([tag isEqualToString:@"xuzhi_0"]) { + [self hiddenAllMBProgressHUD]; + NSDictionary * parmDic = response; + if (ValidDict(parmDic)) { + self.PictureknowDic = parmDic; + } + } if ([tag isEqualToString:@"xuzhi_1"]) { [self hiddenAllMBProgressHUD]; NSDictionary * parmDic = response; - self.PictureknowDic = parmDic; - - } - if ([tag isEqualToString:@"xuzhi_2"]) { - [self hiddenAllMBProgressHUD]; - NSDictionary * parmDic = response; - self.AudioknowDic = parmDic; - + if (ValidDict(parmDic)) { + self.AudioknowDic = parmDic; + } } } @@ -655,7 +659,7 @@ { QuestionMustKnowViewController * questionVC = [[QuestionMustKnowViewController alloc] init]; questionVC.doctorId = self.doctorId; - questionVC.popType = 2; //1 图文 0 音视频 2 用户须知 + questionVC.popType = 0; //1 图文 0 音视频 2 用户须知 [self.navigationController pushViewController:questionVC animated:YES]; }else { diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h similarity index 61% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h index c95fb86..1e65ed7 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.h +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.h @@ -1,5 +1,5 @@ // -// FileDataDetailViewController.h +// XJFileDataDetailViewController.h // XinjiangProject // // Created by 仁康信息 on 2023/6/19. @@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface FileDataDetailViewController : HQBaseViewController +@interface XJFileDataDetailViewController : HQBaseViewController @end diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.m similarity index 93% rename from XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m rename to XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.m index 33e7850..76def46 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/FileDataDetailViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/XJFileDataDetailViewController.m @@ -1,21 +1,21 @@ // -// FileDataDetailViewController.m +// XJFileDataDetailViewController.m // XinjiangProject // // Created by 仁康信息 on 2023/6/19. // -#import "FileDataDetailViewController.h" +#import "XJFileDataDetailViewController.h" #import "DetailTitleView.h" #import "DetailUserInfoView.h" #import "FileDataDeatilCenterView.h" #import "BasicHealthInfoView.h" -@interface FileDataDetailViewController () +@interface XJFileDataDetailViewController () @end -@implementation FileDataDetailViewController +@implementation XJFileDataDetailViewController - (void)viewDidLoad { [super viewDidLoad]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m index 5ca1b7e..19b1a4f 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/DoctorInfoTopView.m @@ -101,13 +101,13 @@ self.collectBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.width - kRealValue(15) - 60, kRealValue(24), 60, 25)]; - self.collectBtn.backgroundColor = UIColorHex(#21BEBD); - [self.collectBtn setTitle:@"关注" forState:UIControlStateNormal]; - self.collectBtn.titleLabel.font = SYSTEMFONT(12); - [self.collectBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; - self.collectBtn.layer.cornerRadius = 13.0; - self.collectBtn.layer.masksToBounds = true; - [self.collectBtn addTarget:self action:@selector(userCollectDoctor) forControlEvents:UIControlEventTouchUpInside]; +// self.collectBtn.backgroundColor = UIColorHex(#21BEBD); +// [self.collectBtn setTitle:@"关注" forState:UIControlStateNormal]; +// self.collectBtn.titleLabel.font = SYSTEMFONT(12); +// [self.collectBtn setTitleColor:KWhiteColor forState:UIControlStateNormal]; +// self.collectBtn.layer.cornerRadius = 13.0; +// self.collectBtn.layer.masksToBounds = true; +// [self.collectBtn addTarget:self action:@selector(userCollectDoctor) forControlEvents:UIControlEventTouchUpInside]; [self addSubview:self.collectBtn]; self.hospatilLabel = [[UILabel alloc] initWithFrame:CGRectMake(self.heardImage.right + kRealValue(18),self.jobLabel.bottom + kRealValue(18) ,self.width - self.heardImage.right - kRealValue(30), 13)]; @@ -323,17 +323,17 @@ } - if([doctorModel.tfFollow integerValue] == 1) { - - [self.collectBtn setTitle:@"已关注" forState:UIControlStateNormal]; - [self.collectBtn setTitleColor:CFontColor2 forState:UIControlStateNormal]; - [self.collectBtn setBackgroundColor:CViewBgColor]; - [self.collectBtn setImage:[UIImage imageWithColor:CViewBgColor] forState:UIControlStateNormal]; - - }else - { - [self.collectBtn setImage:IMAGE_NAMED(@"detail_collect") forState:UIControlStateNormal]; - } +// if([doctorModel.tfFollow integerValue] == 1) { +// +// [self.collectBtn setTitle:@"已关注" forState:UIControlStateNormal]; +// [self.collectBtn setTitleColor:CFontColor2 forState:UIControlStateNormal]; +// [self.collectBtn setBackgroundColor:CViewBgColor]; +// [self.collectBtn setImage:[UIImage imageWithColor:CViewBgColor] forState:UIControlStateNormal]; +// +// }else +// { +// [self.collectBtn setImage:IMAGE_NAMED(@"detail_collect") forState:UIControlStateNormal]; +// } //状态数据 NSString * timeString = [HQCommonUtils getTimeFromTimestamp:[sessionModel.sessionDateLong integerValue] andDateFormat:@"YYYY年MM月dd日"]; NSString * weekString; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m index 044e90d..222e56e 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/HealthyQuestionHeardView.m @@ -37,16 +37,16 @@ - (void)createUI { - UIView * topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kStatusBarHeight + kRealValue(18))]; + UIView * topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kStatusBarHeight)]; topView.backgroundColor = UIColorHex(#14BEBE); [self addSubview:topView]; - - UILabel * detailLabel = [[UILabel alloc] initWithFrame:CGRectMake(0 ,kStatusBarHeight , kScreenWidth, kRealValue(18))]; - detailLabel.text = @"健康咨询"; - detailLabel.font = MEDIUMFONT(18); - detailLabel.textColor = KWhiteColor; - detailLabel.textAlignment = NSTextAlignmentCenter; - [topView addSubview:detailLabel]; +// +// UILabel * detailLabel = [[UILabel alloc] initWithFrame:CGRectMake(0 ,kStatusBarHeight , kScreenWidth, kRealValue(18))]; +// detailLabel.text = @""; +// detailLabel.font = MEDIUMFONT(18); +// detailLabel.textColor = KWhiteColor; +// detailLabel.textAlignment = NSTextAlignmentCenter; +// [topView addSubview:detailLabel]; UIImageView * backImage = [[UIImageView alloc] initWithFrame:CGRectMake(0, topView.bottom - 1, kScreenWidth, kRealValue(288))]; backImage.image = [UIImage imageNamed:@"topBackImg"]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m index 71162c0..ad5e6d5 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/View/QuestionDiseaseTableViewCell.m @@ -73,7 +73,7 @@ }]; self.nameLabel = [[UILabel alloc] init]; - self.nameLabel.text = @"感冒"; + self.nameLabel.text = @"--"; self.nameLabel.font = BOLDSYSTEMFONT(14); self.nameLabel.textColor = CFontColor1; self.nameLabel.textAlignment = NSTextAlignmentLeft; @@ -87,7 +87,7 @@ }]; self.desLabel = [[UILabel alloc] init]; - self.desLabel.text = @"最近总是肚子不舒服，总是半夜肚子疼。感觉肚子有些凉，最近没有去过医院"; + self.desLabel.text = @"--"; self.desLabel.font = MEDIUMFONT(13); self.desLabel.textColor = UIColorHex(#999999); self.desLabel.textAlignment = NSTextAlignmentLeft; @@ -124,9 +124,9 @@ _model = model; - self.nameLabel.text = model.medicalDescribe; + self.nameLabel.text = model.recordsName; - self.desLabel.text = model.recordsName; + self.desLabel.text = model.medicalDescribe ; self.chooseBtn.selected = model.isSelected; diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m index 45d722e..02d22a6 100644 --- a/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m +++ b/XinjiangProject/XinjiangProject/Project/SOS/Controller/XJSosCenterViewController.m @@ -53,44 +53,45 @@ @property (assign, nonatomic) NSInteger selecetIndex; -@property (strong, nonatomic) NSMutableArray * hospitalArray; - -@property (strong, nonatomic) NSMutableArray * AedArray; - -@property (strong, nonatomic) NSMutableArray * carArray; +@property (nonatomic, strong) UIButton *gpsButton; +//@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 *)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 { @@ -114,7 +115,7 @@ if (!_addressView) { - _addressView = [[XJSOSAddressView alloc] initWithFrame:CGRectMake(kRealValue(15), kScreenHeight - kTopHeight - kRealValue(130), kScreenWidth - kRealValue(30), kRealValue(110))]; + _addressView = [[XJSOSAddressView alloc] initWithFrame:CGRectZero]; _addressView.addressDelegate = self; _addressView.backgroundColor = KWhiteColor; @@ -223,9 +224,8 @@ 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]; +// XJSosCenterViewController *strongSelf = weakSelf; +// [strongSelf addAnnotationToMapView:annotation]; }; } @@ -246,10 +246,16 @@ self.navigationItem.title = @"应急就医"; self.view.backgroundColor = KWhiteColor; TYNavSheet = [[TYMapNavSheet alloc]init]; + + [self initMapView]; -// [self initCompleteBlock]; -// [self configLocationManager]; -// [self reGeocodeAction]; + + UIButton *locationBtn = [[UIButton alloc] initWithFrame:CGRectMake(20, 80, 40, 40)]; + [locationBtn setImage:[UIImage imageNamed:@"location_icon"] forState:UIControlStateNormal]; + [locationBtn addTarget:self action:@selector(onLocationBtnPressed) forControlEvents:UIControlEventTouchUpInside]; + [self.view addSubview:locationBtn]; + + self.titleView = [[LXSegmentTitleView alloc] initWithFrame:CGRectMake(0 , 0 , kScreenWidth , kRealValue(35))]; self.titleView.itemMinMargin = 15.f; @@ -263,25 +269,14 @@ [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); + grapView.backgroundColor = RGBA(0, 0, 0, 0.2); // self.grapView = grapView; self.grapView.hidden = false; [self.view addSubview:grapView]; + [self addWhiteToBlackTransparentGradientToView:self.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))]; + XMButton * callBtn = [[XMButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 - 70 - kRealValue(33), grapView.height - 17 - 70 , 70, 70)]; callBtn.style = SDButtonStyleTop; callBtn.backgroundColor = KWhiteColor; callBtn.layer.cornerRadius = 35.0f; @@ -298,7 +293,7 @@ callBtn.interval = 5; [grapView addSubview:callBtn]; - XMButton * sosBtn = [[XMButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 + kRealValue(33), callBtn.top , kRealValue(70), kRealValue(70))]; + XMButton * sosBtn = [[XMButton alloc] initWithFrame:CGRectMake(kScreenWidth/2 + kRealValue(33), callBtn.top , 70,70)]; sosBtn.style = SDButtonStyleTop; sosBtn.backgroundColor = KWhiteColor; sosBtn.layer.cornerRadius = 35.0f; @@ -315,11 +310,48 @@ sosBtn.interval = 5; [grapView addSubview:sosBtn]; - self.titles = @[@"油田医院",@"合作医院",@"医疗点",@"AED",@"救护车"]; + self.titles = @[@"油田医院",@"合作医院",@"健康小屋",@"AED",@"救护车"]; self.titleView.segmentTitles = self.titles; [self.titleView reloadData]; + + self.gpsButton = [self makeGPSButtonView]; + self.gpsButton.frame = CGRectMake(kScreenWidth - 40, kRealValue(150), 40, 40); + [self.mapView addSubview:self.gpsButton]; + + UIView *zoomPannelView = [self makeZoomPannelView]; + zoomPannelView.center = CGPointMake(self.grapView.bounds.size.width - CGRectGetMidX(zoomPannelView.bounds) - 10, + self.grapView.bounds.size.height - CGRectGetMidY(zoomPannelView.bounds) - 10); + + zoomPannelView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin; + [self.grapView addSubview:zoomPannelView]; } +- (void)addWhiteToBlackTransparentGradientToView:(UIView *)view { + // 让 view 本身透明 + view.backgroundColor = [UIColor clearColor]; + + // 移除已有的渐变层，避免重复叠加 + for (CALayer *layer in view.layer.sublayers.copy) { + if ([layer isKindOfClass:[CAGradientLayer class]]) { + [layer removeFromSuperlayer]; + } + } + + CAGradientLayer *gradient = [CAGradientLayer layer]; + gradient.frame = view.bounds; + + gradient.colors = @[ + (__bridge id)[[UIColor colorWithWhite:1.0 alpha:0.15] CGColor], // 顶部白色半透明 + (__bridge id)[[UIColor colorWithWhite:0.0 alpha:0.25] CGColor] // 底部黑色半透明 + ]; + + gradient.startPoint = CGPointMake(0.5, 0.0); + gradient.endPoint = CGPointMake(0.5, 1.0); + + [view.layer insertSublayer:gradient atIndex:0]; +} + + - (void)initMapView { if (self.mapView == nil) { [AMapServices sharedServices].enableHTTPS = YES; @@ -330,18 +362,14 @@ 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)); //设置比例尺位置 - - +// ///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码 +// _mapView.scaleOrigin= CGPointMake(_mapView.scaleOrigin.x, kRealValue(45)); //设置比例尺位置 [self.view addSubview:self.mapView]; - - +// +// self.mapView.showsUserLocation = YES; - self.mapView.userTrackingMode = MAUserTrackingModeFollow; - +// self.mapView.userTrackingMode = MAUserTrackingModeFollow; //1.2、新增点A - // //将目标经纬度设置为地图中心店 MAUserLocationRepresentation *r = [[MAUserLocationRepresentation alloc] init]; r.showsAccuracyRing = YES;///精度圈是否显示，默认YES @@ -354,6 +382,68 @@ } +- (UIButton *)makeGPSButtonView { + UIButton *ret = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 40, 40)]; + ret.backgroundColor = [UIColor whiteColor]; + ret.layer.cornerRadius = 4; + [ret setImage:[UIImage imageNamed:@"gpsStat1"] forState:UIControlStateNormal]; + [ret addTarget:self action:@selector(gpsAction) forControlEvents:UIControlEventTouchUpInside]; + + return ret; +} + +- (void)gpsAction { + + + self.mapView.showsUserLocation = YES; + self.mapView.userTrackingMode = MAUserTrackingModeFollow; + self.mapView.zoomLevel = 13; + [self.mapView setCenterCoordinate:self.mapView.userLocation.location.coordinate animated:YES]; + [self.gpsButton setSelected:YES]; + +} + + +- (UIView *)makeZoomPannelView +{ + UIView *ret = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 53, 98)]; + + UIButton *incBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 53, 49)]; + [incBtn setImage:[UIImage imageNamed:@"increase"] forState:UIControlStateNormal]; + [incBtn sizeToFit]; + [incBtn addTarget:self action:@selector(zoomPlusAction) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *decBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 49, 53, 49)]; + [decBtn setImage:[UIImage imageNamed:@"decrease"] forState:UIControlStateNormal]; + [decBtn sizeToFit]; + [decBtn addTarget:self action:@selector(zoomMinusAction) forControlEvents:UIControlEventTouchUpInside]; + + + [ret addSubview:incBtn]; + [ret addSubview:decBtn]; + + return ret; +} + +- (void)zoomPlusAction +{ + CGFloat oldZoom = self.mapView.zoomLevel; + [self.mapView setZoomLevel:(oldZoom + 1) animated:YES]; + self.mapView.showsScale = YES; +} + +- (void)zoomMinusAction +{ + CGFloat oldZoom = self.mapView.zoomLevel; + [self.mapView setZoomLevel:(oldZoom - 1) animated:YES]; + self.mapView.showsScale = NO; +} + +- (void)onLocationBtnPressed { + self.mapView.zoomLevel = 13; + self.mapView.userTrackingMode = MAUserTrackingModeFollow; +} + - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -369,8 +459,8 @@ [super viewDidAppear:animated]; // 开启定位 - self.mapView.showsUserLocation = YES; - self.mapView.userTrackingMode = MAUserTrackingModeFollow; +// self.mapView.showsUserLocation = YES; +// self.mapView.userTrackingMode = MAUserTrackingModeFollow; } - (void)viewDidDisappear:(BOOL)animated @@ -457,14 +547,11 @@ 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]; } } @@ -477,91 +564,17 @@ - (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.mapView.showsUserLocation = YES; +// self.mapView.userTrackingMode = MAUserTrackingModeFollow; + self.addressView.hidden = true; + self.grapView.hidden = false; + self.selecetIndex = selectedIndex + 1; + [self getResourceDataWithType:[NSString stringWithFormat:@"%ld",self.selecetIndex] 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 @@ -600,13 +613,8 @@ 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; @@ -615,7 +623,25 @@ [self addAnnotationToMapView:pointAnnotation]; [self.ponisArray addObject:pointAnnotation]; } + + if (self.ponisArray.count == 1) { + self.mapView.zoomLevel = 11; + } + + if (self.ponisArray.count == 0) { + self.mapView.showsUserLocation = YES; + self.mapView.userTrackingMode = MAUserTrackingModeFollow; + self.mapView.zoomLevel = 13; + } else { + + UIEdgeInsets insets = UIEdgeInsetsMake(80, 50, 80, 50); // 增加边距让视野更广 + [self.mapView showAnnotations:self.ponisArray edgePadding:insets animated:YES]; + + } + + } + if ([tag isEqualToString:@"CALLAPI"]) { NSDictionary * dic = response; @@ -623,7 +649,8 @@ } if ([tag isEqualToString:@"GroupAPI"]) { NSDictionary * dic = response; - + [self hiddenAllMBProgressHUD]; + if ([ESCTUIManager TUIUserStatus] == false) { @@ -645,7 +672,6 @@ chatVC.navTitle = @"应急中心"; chatVC.questionType = 1; [self.navigationController pushViewController:chatVC animated:YES]; - [self hiddenAllMBProgressHUD]; } if ([tag isEqualToString:@"loginIMAPI"]) { @@ -661,93 +687,7 @@ [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]; -// } -// -// -// } -// - + } @@ -760,7 +700,6 @@ - (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]]) { @@ -789,54 +728,7 @@ 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) { @@ -864,13 +756,11 @@ // 使用动画效果将点显示在屏幕内 [annotationView setSelected:false animated:YES]; //设置中心点偏移，使得标注底部中间点成为经纬度对应点 - annotationView.centerOffset = CGPointMake(0, -18); - + annotationView.centerOffset = CGPointMake(0, -10); + [self.mapView showAnnotations:self.mapView.annotations edgePadding:UIEdgeInsetsMake(100, 100, 100, 100) animated:YES]; return annotationView; } - -// } return nil; } @@ -879,74 +769,7 @@ 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) { @@ -954,7 +777,14 @@ self.addressView.resourceModel = resourceModel; self.resourceModel = resourceModel; + self.addressView.hidden = false; + [self.mapView addSubview:self.addressView]; + + [ self.addressView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(self.view).insets(UIEdgeInsetsMake(0, 20, 0, 20)); + make.bottom.mas_offset(- 20); + }]; } } diff --git a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h index c87c18e..233e2be 100644 --- a/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h +++ b/XinjiangProject/XinjiangProject/Project/SOS/Model/XJSOSCenterModel.h @@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NSString * licensePlateNumber; @property (nonatomic, copy) NSString * departCode; +@property (nonatomic, copy) NSString * level_dictText; @property (nonatomic, copy) NSString * driverName; diff --git a/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m b/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m index 975a927..d17b803 100644 --- a/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m +++ b/XinjiangProject/XinjiangProject/Project/SOS/View/XJSOSAddressView.m @@ -6,14 +6,16 @@ // #import "XJSOSAddressView.h" +#import "PaddingLabel.h" @interface XJSOSAddressView () -@property (nonatomic, strong) UILabel * lvLabel; +@property (nonatomic, strong) PaddingLabel * lvLabel; @property (nonatomic, strong) UILabel * hospitalName; @property (nonatomic, strong) UILabel * phoneLabel; @property (nonatomic, strong) UILabel * addressLabel; +@property (nonatomic, strong) UIButton * samllPhoneBtn; @end @@ -42,8 +44,9 @@ self.layer.cornerRadius = 10; self.layer.masksToBounds = true; - self.lvLabel = [[UILabel alloc] init]; + self.lvLabel = [[PaddingLabel alloc] init]; self.lvLabel.layer.cornerRadius = 3.0f; + self.lvLabel.textInsets = UIEdgeInsetsMake(0, 6, 0, 6); // 上下0，左右6 self.lvLabel.layer.masksToBounds = true; self.lvLabel.text = @"--"; self.lvLabel.textColor = KWhiteColor; @@ -55,11 +58,11 @@ [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.lvLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; self.hospitalName = [[UILabel alloc] init]; self.hospitalName.text = @"--"; @@ -86,8 +89,8 @@ [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); + make.top.mas_equalTo(self.lvLabel.mas_bottom).offset(11); + make.height.mas_offset(13); }]; @@ -95,14 +98,16 @@ self.addressLabel = [[UILabel alloc] init]; self.addressLabel.text = @"--km | ---"; self.addressLabel.font = MEDIUMFONT(13); + self.addressLabel.numberOfLines = 0; 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); + make.top.mas_equalTo(self.phoneLabel.mas_bottom).offset(11); + make.bottom.mas_offset(-26); }]; [self.addressLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal]; @@ -133,6 +138,7 @@ UIButton * samllPhoneBtn = [[UIButton alloc] init]; [samllPhoneBtn setImage:IMAGE_NAMED(@"address_phone") forState:UIControlStateNormal]; [samllPhoneBtn addTarget:self action:@selector(LocationPhoneView) forControlEvents:UIControlEventTouchUpInside]; + self.samllPhoneBtn = samllPhoneBtn; [self addSubview:samllPhoneBtn]; [samllPhoneBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -140,13 +146,15 @@ 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) ) { + if ( !ValidStr(_resourceModel.level_dictText) ) { self.lvLabel.hidden = false; - self.lvLabel.text = _resourceModel.level; + self.lvLabel.text = _resourceModel.level_dictText; [self.hospitalName mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(self.lvLabel.mas_right).offset(10); make.right.mas_offset(-30); @@ -164,9 +172,30 @@ }]; } - self.addressLabel.text = _resourceModel.address; + self.addressLabel.text = [NSString stringWithFormat:@"%@",_resourceModel.address]; self.hospitalName.text = _resourceModel.name; - self.phoneLabel.text = _resourceModel.mobile; + if (!ValidStr(_resourceModel.mobile)) { + self.phoneLabel.text = _resourceModel.mobile; + self.samllPhoneBtn.hidden = false; + [self.addressLabel mas_remakeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(18)); + make.right.mas_offset(kRealValue(-15)); + make.top.mas_equalTo(self.phoneLabel.mas_bottom).offset(11); + make.bottom.mas_offset(-25); + }]; + }else + { + self.phoneLabel.text = @""; + self.samllPhoneBtn.hidden = true; + + [self.addressLabel mas_remakeConstraints:^(MASConstraintMaker *make) { + make.left.mas_equalTo(kRealValue(18)); + make.right.mas_offset(kRealValue(-15)); + make.top.mas_equalTo(self.hospitalName.mas_bottom).offset(11); + make.bottom.mas_offset(-25); + }]; + + } } - (void)setAedModel:(XJHealthInterveneAEDModel *)aedModel { @@ -180,8 +209,14 @@ }]; self.addressLabel.text = [NSString stringWithFormat:@"%.2f | %@",_aedModel.distance / 1000.0, _aedModel.resourceAddress] ; self.hospitalName.text = _aedModel.resourceName; - self.phoneLabel.text = _aedModel.principalPhone; - + if (!ValidStr(_aedModel.principalPhone)) { + self.phoneLabel.text = _aedModel.principalPhone; + self.samllPhoneBtn.hidden = false; + }else + { + self.phoneLabel.text = @""; + self.samllPhoneBtn.hidden = true; + } } - (void)navLocationView { diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m index 04236ee..d76bcf1 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/ChatViewController.m @@ -15,7 +15,7 @@ #import "EndSystemSoSCell.h" #import "DoctorIDCardMessageCell.h" #import "healthDataCustomCell.h" -#import "ExpertMainViewController.h" +#import "XJExpertMainViewController.h" #import "SendHealthDataViewController.h" #import "CurrentLocationViewController.h" #import "TUITextMessageCellData.h" @@ -71,8 +71,8 @@ self.title = self.navTitle; // self 为 id self.view.backgroundColor = CViewBgColor; - - [self addNavigationItemWithImageNames:@[@"sangedian"] isLeft:false target:self action:@selector(foundMoreHistory) tags:@[@"1000"]]; + //聊天记录 +// [self addNavigationItemWithImageNames:@[@"sangedian"] isLeft:false target:self action:@selector(foundMoreHistory) tags:@[@"1000"]]; // 启用侧滑返回手势 // self.navigationController.interactivePopGestureRecognizer.delegate = self; // self.navigationController.interactivePopGestureRecognizer.enabled = YES; @@ -108,7 +108,7 @@ // TUIChatConfig.defaultConfig.enableTextTranslation = YES; //不显示视频和语音 [TUIChatConfig defaultConfig].enableVideoCall = self.isVideo; // YES：开启，NO：关闭 - [TUIChatConfig defaultConfig].enableAudioCall = self.isVideo; // YES：开启，NO：关闭 + [TUIChatConfig defaultConfig].enableAudioCall = NO; // YES：开启，NO：关闭 [TUIChatConfig defaultConfig].backgroudColor = CViewBgColor; //是否显示发送报告 @@ -241,13 +241,13 @@ // self.backgroundView.hidden = NO; // } } -#pragma mark:医生详情 +#pragma mark:医生详情 //头像点击 - (void)chatSelectedHeardImg:(TUIMessageCell *)cell { if (!cell.messageData.innerMessage.isSelf) { - NSString * userID = cell.messageData.innerMessage.sender; - self.userID = userID; - [self getIsSmallHelp:userID]; +// NSString * userID = cell.messageData.innerMessage.sender; +// self.userID = userID; +// [self getIsSmallHelp:userID]; } @@ -296,7 +296,12 @@ ////1 应急 2 图文咨询 3 音视频咨询 小助手 if (self.questionType == 1) { - + + [self showMBProgressHUDWithString:@"正在结束本次应急" autoHidden:false]; + NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; + [parmDic setObject:self.sosEnd_id forKey:@"id"]; + JKCQAPI * endApi = [[JKCQAPI alloc] init:self tag:@"ENDSOSAPI" NeedToken:@""]; + [endApi PostEndSoSIMQuestion:parmDic]; } if (self.questionType == 2) { [self showMBProgressHUDWithString:@"正在结束本次会话" autoHidden:false]; @@ -428,7 +433,7 @@ if ([cell isKindOfClass:EndSystemSoSCell.class]) { EndSystemSoSCell * endCell = cell; - if (endCell.reviewBtn.hidden == false) { + if (endCell.reviewBtn.hidden == false && [TUIChatConfig defaultConfig].isEvealCell == false ) { evaluationPopView * popView = [[evaluationPopView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; self.popView = popView; popView.popBlock = ^(CGFloat starNumber, BOOL isSecrect, NSString * _Nonnull evaluationString) { @@ -510,7 +515,7 @@ NSString * isExpired =[NSString stringWithFormat:@"%@",response] ; if ([isExpired integerValue]== 0) { - ExpertMainViewController * experVC= [[ExpertMainViewController alloc] init]; + XJExpertMainViewController * experVC= [[XJExpertMainViewController alloc] init]; experVC.doctorId = self.doctorCardID; [self.navigationController pushViewController:experVC animated:YES]; }else diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m index 1d0f19d..c1e3d37 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctiorIDCardCellData.m @@ -35,7 +35,7 @@ // size.width += 20; // return size; - CGFloat textMaxWidth = 245.f; + CGFloat textMaxWidth = 260.f; CGSize size = CGSizeMake(textMaxWidth, 106); return size; diff --git a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m index b55c2d7..142f6cc 100644 --- a/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m +++ b/XinjiangProject/XinjiangProject/Project/TUIChat/CustomChatCell/DoctorCardCell/DoctorIDCardMessageCell.m @@ -35,25 +35,29 @@ self.container.layer.cornerRadius = 10; self.container.backgroundColor = KWhiteColor; self.doctorImg = [[UIImageView alloc] init]; + self.doctorImg.layer.masksToBounds = true; self.doctorImg.layer.cornerRadius = 10; [self.container addSubview:self.doctorImg]; self.doctorNameLabel = [[UILabel alloc] init]; - self.doctorNameLabel.text = @"张医生"; + self.doctorNameLabel.text = @"--"; self.doctorNameLabel.font = SYSTEMFONT(14); self.doctorNameLabel.textAlignment = NSTextAlignmentLeft; + self.doctorNameLabel.textColor = UIColorHex(#333333); [self.container addSubview:self.doctorNameLabel]; self.jobLabel = [[UILabel alloc] init]; - self.jobLabel.text = @"张医生"; - self.jobLabel.font = SYSTEMFONT(14); + self.jobLabel.text = @"--"; + self.jobLabel.font = SYSTEMFONT(13); self.jobLabel.textAlignment = NSTextAlignmentLeft; + self.jobLabel.textColor = UIColorHex(#666666); [self.container addSubview:self.jobLabel]; self.hospatilLabel = [[UILabel alloc] init]; - self.hospatilLabel.text = @"西京医院 - 消化科"; - self.hospatilLabel.font = SYSTEMFONT(14); + self.hospatilLabel.text = @"--"; + self.hospatilLabel.font = SYSTEMFONT(13); self.hospatilLabel.textAlignment = NSTextAlignmentLeft; + self.hospatilLabel.numberOfLines = 2; [self.container addSubview:self.hospatilLabel]; self.bottomLabel = [[UILabel alloc] init]; @@ -69,7 +73,9 @@ [super fillWithData:data]; self.doctorNameLabel.text = data.doctorName; - self.jobLabel.text = data.doctorTitle; + if(!ValidStr(data.doctorTitle)){ + self.jobLabel.text = [NSString stringWithFormat:@"(%@)", data.doctorTitle]; + } // self.messageData = data.timestamp; if (ValidStr(data.departmentName)) { @@ -116,9 +122,9 @@ self.doctorImg.frame = CGRectMake(14, 18, 50, 50); self.doctorNameLabel.frame = CGRectMake(self.doctorImg.right + 14, 18, w, 20); - self.jobLabel.frame = CGRectMake(self.doctorNameLabel.right + 2, 18, self.container.width - 80, 20); + self.jobLabel.frame = CGRectMake(self.doctorNameLabel.right + 2, 18, self.container.width - 2 - w, 20); - self.hospatilLabel.frame = CGRectMake(self.doctorNameLabel.left, self.doctorNameLabel.bottom + 10, self.container.width - 80, 20); + self.hospatilLabel.frame = CGRectMake(self.doctorNameLabel.left, self.doctorNameLabel.bottom, self.container.width - 80, 40); UIView * linv = [[UIView alloc] initWithFrame:CGRectMake(10, self.doctorImg.bottom + 10, self.container.width, 1)]; linv.backgroundColor = UIColorHex(#EFEFEF); diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json index 2305880..9107302 100644 --- a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,6 +1,7 @@ { "images" : [ { + "filename" : "健康油我 1.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" @@ -12,6 +13,7 @@ "value" : "dark" } ], + "filename" : "健康油我.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" @@ -23,6 +25,7 @@ "value" : "tinted" } ], + "filename" : "健康油我 2.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我 1.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我 1.png new file mode 100644 index 0000000000000000000000000000000000000000..1cf2a68322b2d4327a63813ba92bd75d21346fa8 GIT binary patch literal 55224 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 literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我 2.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我 2.png new file mode 100644 index 0000000000000000000000000000000000000000..1cf2a68322b2d4327a63813ba92bd75d21346fa8 GIT binary patch literal 55224 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 literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/AppIcon.appiconset/健康油我.png new file mode 100644 index 0000000000000000000000000000000000000000..1cf2a68322b2d4327a63813ba92bd75d21346fa8 GIT binary patch literal 55224 zcmdqJ2UJv9w=PWROBY zKtMo(1dAX!l;lu%75Ml0?|b*$bMEUg-gx8L-CL;IYp%KG{MMY`oO|tlp`s*9Nyb11 zfj}tbo;*~8K+c07&qFSr1AlG!*M9+jU2=S)>jHt0Um^TQ1W8J{27z33x7N^c)qyLD znIY|YOwEx`5j>vuj^J(xL_*rr(bUWq;mZ0HVQK9kd1Jk<=?1H{x#SIPAviDGQ3hdU z{lv=|q3)%mVdiCPCTe~|T8dS|Qw#{ON4T1@dfMALxQKa5-Z+&j27V@d486g6dW);A ze(9X9sd^V;PT5(z+zBO zQ%5Kt4=-U&|GE(l|KHzgZ~yn*F0PN?SBt8H~V{HM>l7?Q!|;HK@oNcdoYI!SQX#jdb(O${3r7ezWJXF zfbg{bPi`fA^FQ6{XoYk|x>zCq6Vv|v_1}XW#o$PDYYWsvQ&)uK4S)+FZeC$-K3)wz zUNK%_F+M&{UH}kYf_WUpWSkMEu1IGMB+~9*I8*u8gsl96JiM%Tw5=V?ksdC0|7`%` zza<+EU~F#cYWm-~84eedb8vArbudH7J(RowRO7L>HWxF8A)X5H3-fV{nhJ_=^9u-C za6g3si1YIE3Yznoiy$muXA1%2A0o}%2u>l4Kif*?NHZYgZwrYDikh2S2#W}C^TVD3 zL41Nj+@=-+Fm4M|b6_R`L4>)$)6-P~Y0A#lU^koE{kv3xR^~vWkeMk=SXfj5>_UDR zw~&Y+g8Qim0>*8QFcah#;^h+(H8s7#YHlWGfpoSv1<4S9UUxhuo9p^5DpYI zCF~=~8+^Y$)FHsv&h6|&VScc|d7*rS>#y&1|BLVc<7-U^YcMJQ4ORk}#AJ|mNN05r zqW~IULP7#Uzdl#7_C(m}JhTQjb2(FlmtXMTztjD{efJ-xJQWIX24o5lq607uFxnGq z7XT*IuXv-5aQgL=oi*#}CKfX_J6oQMsXM~_#;*^p{}+z`@0s{asD~8-nDKuD^t0Ps zkQS~Urp}1_mcaJ^HQ3JvnOT`SSRz0$hu(nxXNxgMI9vbQavV*aO+f@lIJ-#RFhe@H zBb;3k=ByUZNPAXOM@Ktrvs1rA-5tz-MaaLc%Ib<_{ST=8r}O=n#{2K>n*Z002PLG8 zGf+VPuXs88{o$D<9}{eK8n(s$2{u3+7Xu;S@1XF1wtdg$NB+|=K=9(}!v8II{_7)< zkO@EjO$ER&f0GG>0|1>fpbEye5p57i?+>|$_cc7nR*tQUQnecwc8`YzR!~yJD3O@V zJ8C!;jsmoX+xn`5$GDtbhZDmyv+FzLHyzKhJKpZt2&?)1>!r(Wsr64NNdNlwnDJ{Q zCA(6cq}y(T+w$-mRQwYs=Dr#F-TL(7Pn=LH%^Wp3&C7DHCJue1e>-nzwD<)zTpof) zO4=SLyc;G^r{>9NUIK4|5D_l_MF#J1^{s|<`#{LsXoQ?f|1dL{3EZ=#^ zT2fq5rB+#4I=+n#Ka2C1)k??jFW@tJih7FRIEnJ%E(Utc72NjP+vw0p{mrAYWmGV| zFd--i@KnPpQ5N<#IG^gI>e@4sB(C|thREW?xe*pjnO$dFCEXW6^l=7^W-Y{ z?xoN!-{K@`^c@1!w$Qf0$t9iF<(G@Gj#nxd{4~I;+{P8L#nn|V(ibfeh2!ci7wpUG z!}oodf8DblE34(9_KZs=6jj-zaXi!7LZ^Qi*3O?r6aaxtzv9`HHcof3jFc{im7`KD z2f3K?I`2ft%1J0;<>JE!J(F_o$Dg+r>j86QafNLO_TqRIuzfdM)}$?Wy5|~iK}`Ho ziz;{N3iFo9F9T~5L7KDl4x*wx6CYy*>2GhcMaWu9$i+A@km@p+ca|<3W^s`NmCNra zd$8|$SRTYkDA=XVqik?&eFDkq(`J23?WQktYUkh(f_lHd)J-0jNZ?Oi&?@M`SeIQ< zu5+rn0zZ_ixe{_LvU1B*I`TkHL@|?9AxmQ1aH6R$*wTXp@8D~OSVbatNOo$C6F!iWjTVuqpnfpsex_`G8PFwq6Dt)QW>1$Y%JfA~ktF@)fqPZi&?+_Si@=k!0OF-WH1iSSP7I8Gj%@e-lG^)9YQ^iOhv z*#ksBE4Oa*>Lf=Fw{C*P36Q~BJJ+V_oId_;cqXR)n@de5*D7Wv!o<^!zlL|shbql3 zmRtqpu3*68fy(>8TPzkY{y56_cCYb84Hzd!R%b1;g~`e>^372bOxQf}<@lS(3c(3A zVvEMt-1?&4k34Tt5=7WSPbYCfB;^3PE?KF4!Q$YXCD)0tyl*0mIedYq&TLM(Sniq# zp!Z&qDV@bbn%>S=Y@(5#qJ!(_nf-gu>pCMQnt0a?8Fn4cw+$^?Nv0HqT=6=D5FE`b zt(L3|1UwXeKEvL&8g-Ct88TitxXGsA+->83W{bjuCfab|6z$u`V0o3D(-yo2sgdf* z0wQPTjAHA1&eb5ql*;7LG%~(tUgO4jjdD<=vpoF8F9~wORHdYWg)uETPRQNTwEr1r0gK8!q-LMa$ueMxRd1>b2qW~5^MgjF;Ve} zM&6~>59+@Lix!=fDhIPr!lZv7{lq5T3o&hD|59%N3nPLg3Y*3|JO<`E8ns$zJDKkY zEG~@k`|$jif0bX}0#>CyNM@m|;t79WIN0wlk#lfnu}Q^&?CT)_uF9n2>pzF3ne7I? zfnmU%wZ$jEKj~D}QuGeSjN1-MV88uo=6f2g5`~@8C}Z{pvUlBgcf=dEUD{G399us~ zpLy}lrvb41JYZo`{d9_|62*gL)#kTnEZy5O>Z?6t1hl~TM<-e98V;Vo1 z63G+kU3Uc!Tm!x_1=E3jMFlVaxs;7JLSk1Z2~uqdPP=yX%w-XA4$2+c?8i|T^w+nC zrJ2?Ys4q|elLFM@7I$2az)U@<nc)X`ixo zJoeXgQiXW(tTp{_mDS$M3&G>pRqt(|0hm$Velnu18#_7vZM?jr|g%Js}77) zBc+(_8fsk*16wddodHW{cHFNRU&Lp%%rA@EBHczxl!FU;=znSc`A$Ts;=%ehY;tK* zN_-;smrta0ty3@yvfn)3R~xUF_UuJ*H@V9Db%1C#^cicx-RW!UxSqT}IqYUQriGJv*I5--=88S;_` z`>zAd+(*FR5~Ys&kAE#yBFSQL%=JiVeFs{F^!+>qcEQ)JGobo(6*Y)0HuW2Nn^~>` zxOs_W{7Z8ZU1x!74MPpb<;BUs^{_0~>iB>8FbCEover;rzSEsL1ooc3>b=!7tNM_Y z|J394bg^8`(-)RvvRnV4jscOG5K?I7MlG|}lD}1^Bfn+;nj{Sf5~HtgEI(Kv-0rZ8 zeaUwQ6Da_bftpRzg9Zw)+QmCe7I7$Js@s4p~4G;ZTo0Vb>SPr!(akVJjc zcq8&)DJpMI8TQ#j1E(?I>Us-<8AK>@v z_DcPhA3bYhebq=`iLYbdi>ByJ+19RjN)oo`p1T?$zQ)W9m%3|7uORLIj0s=Dw_LSP z!+K#nF-{R!QOv7N#ttFOE9^DwHBtUZzQ-6oj1WdBa$O{nf`r9S7!p3$ZbV(Uuh5z6;l|3=3f{M*Qct7K zP5Bai$B9fVE#rs)hVOB-sm`X*}yX0Usn@8wnZG+OKeOeEX?^DqC4xO8!CHk&F{8hs~fk@l@ zolS06vbpHxt+G?IAYue-`4^i2070zi%I>pycG${?+4sq5T(5B}eXDb4ol`SGAFK+AjUukAU8xUh=l36txS4-iz`rmHzxldv{d4&hXAq!_zvIvD8E4VUByom#wg#KJCL;11XseL%A)97=+73 z!g{Bk*f+wMK*;y0t2^m*ETjtw?`+^z8{HNU8faA8w#spOV<4_mvd*cs8;9m@(s4DM zs%gY}Vn&ba+GbCg(e(ZIgFjuow^tm!ld*p5T5ZrZrB&gh2jfs~T26)bF8SK`r8T+-0mQ!bU6{jpVydG9tw;Xfpn~;J+n`)DU3G=Nk($Y} zoIP=BZW%f|;cdUB;|6IJTCMH>&Ud*hTX`GbL(Axqqam)|;M5|AU9qGj;KZnOMzgdR&tc4K0CS?J7ke8P!A#4Oo08KP{oHh_$Ss^CF*{~*N3Xn1UK@d-l zjFB)?^edkA0t+V28GE6(tmr$VXf~r!+*Wj&VoZYVWe0Z;uQz>d+#a>E?7~bz^Sw^q z$>a8ix5|6wI+j<7bG!;wio8kAhzW0uv#qSP4{E|2BvJR8a;E-WTx77Z0at94X0q}Z z@xJQ#bUQ9)o)O;;g!$Pb?4obcJ^toF$gSenXZ|D_9pZ^q8WC3(jt4d()I|wsP--1Z zf)EXsjAT#pL4w6m>u}7DIGy2#tppCwVnV;I%w$C?lWd!!u$c{e)C!ylLMfk!mXXm>j%2d4N4iV z=wVb&`POj|an#5dchjshn(owy4t9@PNRN9wyp{pTnM+T`g9d;}3g*89ldxYWXScOK zI0B112bq^ou>^!3EDoeUFYmq2#(g5i4>nzWXWDm8w8c1;VOK%ixL3$R;4aM)ud_S# zM5KhrM5UKXLSlSMnGf`x8_eP`SGI!|^t<~66VmfN#2D8>)dP~1fYw;(bLzunus(+n ztmOE9-gFJX2apQ&&`Pu8Dv7nx>|2;S%WQz5eM^d*TrN$&zD5yag`{eAe&?Jy=9ST~ zewZ4^em#t|+s*wDFa)6Upcak6H3FTUx)^L4zt*#auN~fsx=PjXdD5eP%WuOkY(zRjkcfb`C(n6u*aICuIYR^;@h;SC5NPC$HpjK|ljK zYCy6^jnP|Pz_uVKms`h|1YyInCfij@uZMV}w=D;uX+@RBi;SLbGtG-$A!n3}cY)tl zIIGjLEma|AQi*XTbXXZdg6@DH>gPK1M5GPrQ#KfLyk3 zGT#2;L0eb0d#UND8s9r^Xf%9#bH+P9Nph|}94sfW+GN`q&nT{AKD9g*sX-mjN|)&l zg^+X`u6TpV7X-o)fJ)F6SHgnoaI2=tg8?s&0g1+vfn3@^xCtmz}Gg$YM*0g9d0Z62C#&}1O^r>$M4qY(bf zl}4}hubVF}x%#;A>!e0zNhBXCI2^PC6A{)uG1@nA77UP=%6@wB)`+Z?D9L8Io@nER zkG^9ocM8c#{pvmU9!Auj0fSlKNh_!Uz`v_jV!L$u+ecT1hIhqDjTRY2zWq=+CWZur zbemq>mZV4Pz=H`z0et@ODRnFw?1vMp z#gBtMr^wy-Yx)v|nUT{C3rLN(^~80yen#VhSMi~7dC3Z;+>8fC-uS2QTECrEL@Nyt zlT|I66c8C0cONfGkOnAa9NF3K%aVtrA-Ms4sNDw5jsBL)tP&!oX}~NC9pA3Euznms zHGF!Gl`^tzs&f1Rc39vX!!8p@Bx;`L0!Y~^QBW#m2v)x(KmB2Cr3>n{P@lAcb^X^# z{8R6#cQ%6_1`dEKdS-8&hfqI{11UlB+T_Jx@l98wLjR7$wm3{-Dsic+7RbAZgaAsA z+eK;ac>d;WTb()mJ>TQzwO(5s%Sa;7^kD-|exVtJkK6XZHO)6)01N$=DM6@MudhyA z3?4)o93!)pGJMdJsFK3-aqyU*(a^DomRmNSF+7mU~ zsllEc-y9AF{Aoz`)^@NLrUIQ3{lR{bh=nZ%y3je0MN7FDJ?n={P*TER-2kw%gfhl< zX3t$@t=$wBHSVA6x2aK#GqBxP^nE7Kbh`Vz^-?UW+d3;dO(awPM8W*&ble*Tw}Z5= zQh~6o$Du`0&3Gy+fyCPR<~1V_tFxMWzx`}_wG)SiR_rzm=!)vuiv=IB081}f5r?i1 z3o3x>I}E$#PBWWS2$`nOGrR**O1cA=l+p5+hI7@|!JP-dC+ow!5n6d*k6I;uaB)A; z?%_-+s!T)jq~}-uH~^W`f`H00n3tuQZ1AoTIQ*Eq2K)kX-B?bzHINb z@A0;y9px_0XiR+}+4Q$Loco^kH%`VvSh_Wj)c zYA^3cO$f&}SSm=Uw+{RWU8q)Oh>!MTYag)AREqabB9`C$cM{NjLJ8@%+)P|UwfzJi zL7ohVL}=$_fsT-4Kt^VCkw#v_aG3qRR?@3m3Cl%O7Tf4DhN9? zU*4009lAP*Kh@di4~Sy0@VxCIvfn8oG!7d#ziCq_gY`ch>sQPoE1U~@HJ%bsqGq97 z^*iZk52Y`9*kcU;Xj-`UhHy*u+lKp(uk z;=1xko0BkAIZ6~#v$hXXXaj^cEVSfr7cE$q1&hk2UuD{410)mF919cnkBpk?9z?hJaW6XKtA#sNO{sqq213*ZE zF8-_`M%Rvl{ngfU=SN3BV+91PM}rGcM{W7aVB_hN)8xK!U5g>lN&3ZslL!mtz3vi^ zHwMy1_JEQ~w21>+0Z20R$(EgXk~`KhrB{ylvsT95DeqpR>6$P;bI{Fd_vqXDs-Pn& z(l?LIWH8#as&uL!L!+ds!FehmVd|sZq;f0JqTQ6AZrNV~%XPIoq&p&TPOsDS5DI}L zvS`3+sMTx_9JuIzrlxk%_-V75^@X#o<*{>; zA5asOJ&-?m0?he|X$LYb^~4UQh;?98DtDb1c*j@#V9}(Ys#Ig{CqV;$f(EQl230Rp z$5>I7h}KbQqUI;?rW&0)(5qdVV+3D-lKfU} z<^A}d(RZH2xMB|R*9uk+4nyPSp61NcQg{FsNw732Wc2=JH|(MayvV})u#_)X^A2-~ z;7)=~(aCA@neHx%o!{pL&JyfV6UQMh3~niqc5mmX<@|X6FK;MV;6BW^39j9mVGFZt zAj-E@tWy!wDOu&zlBZIJfIpz&U_U%2*w-N^p_pkM-|Gc&47c8Ik5jYHP}yNhgP15c z)gsh;PBQ!;0i_=V+1HGCZoyb`oS;;Jf}NH=)B)=?+)Xu28uqmEC8pH8J1f`4)x_e9 zCPF95K6n!mD&mDT38E)hzsvBl54~GgAU8D)N*5FK{0ct)l-~I~E~3uNLB4(@Ngn$X zp}x-@N8QOS@PL44zncl)B#CR%|BMlQy||Bmj&&!SbI*8k=)aP)>zHk2IAb4FOT202t*2dq$bz?zhgQ?r-x*V@FR0;^i!2?uKbH~9XK}g+h3Ey< zG^V@Kj{O?!m^$ye?f#2 zAd^ejmm%OO51TI>$x&0(FDhPJG##2rnR5l9KBtaQ*Nxv@iDUI-U!+%7dNl*q)htOG zAb6>a?OpAwelAOhZ0-#0RkFEYW0On2S!lvk>$5y%<&uY48|k~HsmhC=Qf28 z@7580GwUF-!^@yc1cM-iso1meS*}@6@y(R|v5F_}a4CQ%FWjBnx-FXQ28sEXC zg$nhcF&NydPc`^5i*6Na*Ow0g{{)vURv%gqcj-NCHmDbL&XIxhSZ%zDsGbvsAIlA; ztL^6>-EJcWy9mhw0oK1ICxx@Uur(C47WloYb-ZMt=7dgc+hGb;;kkg-W{rN6~Z6Q17Cz zE!so)$If$m{AqT%Tqv-3>U{e1dS!>n$LSHrd zbIVjVt5OZLoYK2O;Bz%-b`6x`+)Z-=rSPeo#_`-M7vKDGO?{Uf-lXF$DKp|Ck>uvj ze3!}AOFgUHeec!dbQ|YKoAFyJu$UftHlM(YCXL?(16=bvby|c(NoeEkSDl8^`FbdC z8OBj{7Ixn4GPP$TsBDsyGsp$E+^69k5fLg?*(JL*l6BN^lYLUl5#AycRBh*I*y08+ zwf2&6N_f{|_-8=rol013Hu&-39|MVM+u!KNjHj|nM@jkD@Z(!gda>A7YP8j-=)lI z<-u_zLTT#T*<|GWX+L5v0OyPJVI{g(DUgys8S_@WH2a{UJaf{_5hlL+gUMvtLJbZb zbb^ifosWVFE4Dubz6|M-xkdaaIkeiYqM(yj-P<6}jDtyS|K$-Z@H}9>)x`JWAEDxV zcdkIxof^j0F0-aVrvDf*deN#$DLp*xD}JQYqWS207e>BA17Bk~wT0u35^5;PF6_^% za=kaCp1WU^1UfGA?Y`3>R1BD-&!NU&*bR<*hX*(Mp3 zWw|i;W^P)B!sro>i^%PhZ{&RL(+uS+>up5>BcpjwfUU6|eXb=r@Ye;x;W<8jOZ7iy@jlWdNs z%0H+nkS>^aL8qx%HzkS@0hwk*Ci4l9TFhNhqtR{24%17&G3UD$naj@DNA!))bTHKC z^;?Dx(_fQ_mJ`yf&+$}f(IgqMuR(iuD{5 zezyiaozyxWjj-d5DZ3X#-gO&hFt~A3UA*`p2A!_Df6e|mK#kSHt|6N7AcW`~Xd-dG?ok&X$0a<*cud^rfMDzLL+x^{WZI&>cz5qi z4gU~mAMeWRy7HLR}-q40so|bWla+Z(Pj>U$s(RG0O5O1h>Qgf$IyN#clD6dTWR=_$o3BunrWE@7W#0!xpjX_-_~|!>PJu{SYLy9v zZRy(llkqBiWN^BTmrTFdkn{!u1tLz4*>!`#A1T%i`NQ4lv{-c$JAea=BCoV#1zya@ znM;thk~eY(Nd{VY!#bSH_LQop0?f=LpcLNSLK{?=G+D734^mYJI_>2M>nQIPHUjP z?pBARTWZSN$Q`&eB<)DOj#g~ZB&328$DwTEQN=kkE>hq|$i~IkyE93*>Av{)0pw2m zl4v7bE?lV5MrGC%x)yQ0UHtlC+@>*mNiI(7+I5iUAk?MzUQd3W_8mVC@6${$EG8%>XfhOh41a8&XQE?7EG6D`Y9t*n`H`6pG?ny0+NcnWPu6 zA-_l4d9&5mt`T&Za-+S>F*fkyN*zvN+h}CNtbIJ3Y=hPO3Y>?NX`D+?_l+I;fS&g1 z91Z=c?o*V>HqN>Y!gjlql#_!$-+$-HIwzshAADhbEIV(b>e9#;FWv1y*NY^;FphXz z|64L7+C$#o9FAXKShw*~fFTS5LS7NU;wWNW?FWQWYzPjPS0g4S1V>GbJU82W_r9s3 zL0ITOV^F_hpOiUQ0-zaXH~0#uz5k4%ui$NSGvqu3Qez3ztSFcXaX;*Db{BV?`lZ3K5HQud`%vv=?FirUfoGAI8=aZ$Au7Xm+Jr-F55Du@!dPS%q~9B zTNh5@QvK>Dh<+#I?h6S^OP5v+oRaT9tO)Y9kFE zA}@P8Ie$O1OZFNq!RJjkscG%=cjLdE6nG(R2$4#a$U=zNTz&M@{EK(5?Mepxsz^?i zu#YKRYVgbZX6cx^#FA*Q`(_h0_p0YyOeA4l>iks11ianrl7Rysw>g{`68642sx=>+ z(_ykcdcE~^KI4_SL>%=dBcay#inBv+lDHXHk4tOfx#7qzi*Pbt=%$paqb95}y7Nk< zvFfT|$Dc%C`QEi6e}RmYnm%6Kl-J@-hEzW$cG-nR(HbQ5*fY~7fAj>=MBSW#n}7!P zWE&r)Z^mQA(&~7_phAjEyym__xi7EVZe%=7 zIwr;)$M?}ps)6%!FkLomf#2g`HBy42HwQ8>bQL%{_hn@v&-ARufQD$I+-mdU%HeC; zFx5G}efX*G6FpGbn<)De!@6Tj2EQWDkUxlaURoI*dlbPHVg28YwQwj=lE)-KVxsZl z6D)3Q|244r1(rLDd~D5=PX!(=Gt3UpWA1+3)R4Se+H#6j+#O}X6GeUhK8Irs8MMC% zby$_)UUOHXME}z+7f1l;g)!%tk<>9s;}zSeX*}pJn^2dBRtp|AcQNGMsV?erLJ46` zXG~r{Py|z+2-F>`Q%YwZkh044=LWOr<(aT?A3cn)6un77P>g(3WAOUY@sd(sx@Ynq zwd0I&9LlkIWuk%4P@NEchI-^J?A{idgJsSK#9@dDX6^-MVLfF>=tyPrs*E!=5o=6O zwm})ih530zv6W%qZn3%`Mty-4ojRXlLKqMa*a{kKYJGq0V~@pM|I(DQqu>dS@mqYx zzq4vrWSrD#VLo=%}uI;{HNeI3$-0-f}ae{_a{*s(#WLKd8 zb7E;!nBoljpe)idCEBiJ=~5aoFbhOr$G2pWd)p5oj88jQzoVCT(4>HQ#kddGj4arH zZrzZ*gxwO6pv8$Gek(!aBZbml#i^@o^F1a3a7+9hmAOc{JykXiAY>0mc3OmYRYQ*@ zK@n-7>ZCg-lk2QVsH`5$wK;QA^wm!w+O8dGT}YgaWwiCdR?o(3Ot8y{o+o6RgG`}q zqcemDRhz2^&+5B$bFiqcUK&d02Lwnm<9lfR`}(Am%<#60J+k{ydj4jlGRub~qmeh} zqFU|Hp0a^aE4|P!-s&xsbCx#V51l|CT|EB4*D9)(|*E{lGKSty=@Ip|`vkMB}lBnAzr9H_vejYAE3scz?Kit%!;`WD$a*gIG@`nj2> zgzPi6ebk#P;L=AlKCURa@6eFDY2z%R8Cgz$0eIU}5ZwZx>ajAM4uJ49^6*$@A`~4} zaFT5UYSGpZ<|d)MY2?Q>>&H@u0;SGfF+u*B&Dn? zSDSN3+if%};j~2`(oG z^ep&G)=xFZO{uPi^Ob}uxbG!m76ARKz+Cb&K7K7w`^G`P-PgGg&6ve^hd{SXf(n;T zCLE3ng46GiUyCX|ph4!JWa~`{tR`ss%eT|+_vkL-aHNI!PxGUnJc#(~4g*-0N~h5^ z%0}>^nB2{j3oHaM)t62)WE^m2n?*>Mi`!#q=JwEO=1&N)CsjYr39S~|`|R$Y({gBM zbVL>u8A_@lX`R#uA_=(oxRw~58=fDYFK;^k5uA|fZ9BQ;Bg(zcO}kt8na{87YJ$+w z!@*@TWK2mD*W|#o@3I!$N!L%oFZnFS5$~OwRK*(t{&#`p?wE;0V^IxYx?lX-1=H16 zFVSji=p>daDB7ouP4pgIX1%FReR!!EdFxs08X2FuuR*1N`$ppd(%R=4#fJVCs3Jk9 zL4h<}TN_KCbnY2I%+z)@GJiU0wIO2?bPh)M4%@xdf~rC}(V#IxH{_=okvCr^*jWrO z?paxZLZbOFB2h|^m$R`NQkmaFLk|_5`n@RknLr(hKevf0^m*v#%>xyzM5Q1`SE_w{ z_mTseU>El4#0}t!Z*21H@JxU`?mZv)W4&BFI_)uweuqHNt$n7rsE?cUw1n*>{u|O} zBW<;zU=wvq5`)DlFDH?8+eny!0_>2~MnbYQ2cN2aKaCxhe9YAB9N`p>dI)XvZ781$7SADP&3u zYb|6f*hBZlQ!nm{i~mE_6iZbp9O$n%Vx{z!{TsJNxLAOtYzv&f?o5qr$bjOK8nqy& zR*^AzeYlvRwB&)lL);%kAYiSrBy-eco`^3s<#gWa<%nkMNN9Rwj2Vf!Q2%qv1G*kz?b9@Z;5lT@aGU$eU9H0tbOC!I<5j6nk}0s3+?7$ zQaS#l$WlTIOe691x$V-)z>ZPg0siR9`;4VaLTLc{L!L(4>ift|pJ#Pk zb+B&Ze1GP>1zx4f+XNKd8;#s0iCuiP2o$AM?R~I+>*7GYuDVW1DgD{itrU8~7s=5v zjMYDC)+pe3f7SiB6X?6e`89TRfM}1n zx+z-*NN6~MzJ!JpS6=qm74L-%MnY-RbW4&_`rS8U8y~0AbQujDmAOPcXmT(0kdNw6 z$F9ZHCR<-17bR$93ml)HR)QqHl7uvQ6QzZAZ`tsZVB?FmN2X=q$hF15b7e1XC)lmK zVTCny)Ls*w;6Nte#loLwGeINZq>gN4=VwL}A-MLm+S)W_j#<+t?5-5ZfZqRr$defJ zc+m8!Q-&CfxG>%nC{IvTJq|z0y<772yOi71=Z!YWhFh%l#gqEO$mFfx_qkC*Qtbo_ zA#X;}01E+bpyH{3s+a9(@#Nqs*eudLG6URjJ8x%i>$_lIpdfhaoO{|;6HzjCPlp`k zs^u5%{8|5g6Fq#lvxXsEyDV!|I&Z&3sUS-wkv_ZviBToE5vhJe?2oF$PCYl~~~kS4@LXr)%52d(`|{}1L} z!K04{OzKkT0Y6d1WGyQop)Apnp!zuRW=PenXp|*wDMs(qh?Tw$8u{Y$YzaS-t2?Zm z>38|jC@ZW|1}HcIUCs$aGbT*U zrV>)*kx_r{0do9AoD8|zxzzHpu+UvTmF0Dg|Gm}qZcyvs^%C;}*%)&A71PhJ(C4ij z(1KPZ&doA4(rcLr{5GdLub&-Y=m2vH5R{=5ZD?>`O;aA}p=;aC4q_ zA_mPdqp4?UU1^Conk4zS-}!gE_Dp;bV*5C z07pS5E(90`Me0on8yQ9-BeG`L<-NR@HIsh|9eqCF1{HviC<6t-^iQ{0IO>c0*%|!a zfC|)=+OSSt#VI`rniQ0tkCPcvDmU2k(7pR<0K5fs3wRguwp&=K9e3TY#bw^tyLw6u zt2_7ZRney4ks7v0>%l{tAnC>A6BHW!dH8>#M`rZz48*3B(%a6+U*lqCl zDhHj(>KPl=c)-E3RjV=OOi`V48jcf$|=h7aSz?6 z?<}@6?C7*N2l%$qSm+ATM+?;AUuKFuoL`Pn>v&w{$U4~CFkwtNY;ZbI@(bOa$>F{F zU>5Xe)j5$mU%)osYUjvMN>>pota$hiM(BE+dm&z0Z9x{DYH@!<`1kom))!S-CMg(! zZ}&06O5;#i{qrVa;sCbNjCmYC#yq2Pk$H*I2C%WQ$#Km3N96Aif>icVgZ_9BcRY>z zgYBwFOGYO|mpwM4DmTnDSpYyDi}ueSi!5Pg95IFdawHx02RXUMT(xVH4OvR}E7@aZ zG1oY)H!=oh(rPw56#{qdt=qqVep6<{XJRq}%vaZ2?cqFQn<#)lrJWDA=&lZVVgOAb zmsUN#TZ=Fvnff58Fp|}&B$#R;Fa@bt@dD@Re}+Bk_% zeDvLOPKMN>*=YF?4TJe_l!TrR8@XVu)#190k6)?c2})=vjh9@yzcorz{LwZZZhUu` zD#q$&ifhawqaft?0q86lmpN!|v%_KU>PYdF(xb%i=AyEDEeP?w&otVz@glhEKx=Qg zii{R-P)03oH>fRZuxKyH>K$DXN}JKgCo9-DUJ0qr%__D^`s4{A9Eu+cQY%#9c+VrO zZDiO(7qM9cj|&1BkGTi08L|vIeXY;Q$kEcBg#<`@KhuN_{mfK6Ty-$*)M)WTqo~7HAsW*u~dAO>rA@-rCiQFm8{&7o> zNez>7)+iFPB<_%>;;`Qy-955A;z)*O);<8we7a;Jq*8IWi8do|CkWMMJHq3#oI~r+ zgWbvNKjjYSV`Wx(C~U#!S?Q(*>J!(IPHK9-^Ml~U$vW@`>CjS!O|^KNx!bMKzoZykx~1?W{y`z8&?uP2Az`%IuoHTogg zHq<-Rq0hzav-z7%-EnEVP)-h>ZWXVY-}maDUW7~t>%N&rGx-&DK0>%O95mHr?r`Sf zZVsiroSN;Osx)ONRgxVE1aJ42(fgm9{wP@As+KWuH&%prkD50!v>Ppr7%R=+&J69w z`2fRrY64YfpGW^8%o24@Dg!dn1g+huB3P`*)6!3Phn{u}oeoQ7DcF`AJDCvTgqNF( zlYzI6+-W}D$FrCzeuMJRf>$kSKVE(#En!q5Px|GcvGZm!1$e>`IluEXrsOu=>TKDI z;W^FGON4Ime*QfFqj3gbn+`e}WUq@pbyLomb)}IOjzlxE^R5$aT`9>DoHCTW=J00= z<4^pnSqAl8vP1bHD%k+v!9NP~cm4#8d4PyUl={3^j&eA*W{jgQJSHCW1AQB2c)2Tht5R$c*>N96XZc8+pR(z#Mv>rgX7}$V zQxy~i1v@p1N6ohl5$X}pPpd!ggWg*^l{A05FL;i@?SdmX_HfF+g;xAXB_^!vwu|@c zAOtA=K*+_B?AtpWHvC}kAL^X`UQ>MqzL52u^Swhil$(yzt*QB$^3?MwE!?9RxIMoH zI78zt1r-3T^r30VxTyStYeW!gI&~Vz+UuUUpMnh~orw1Fq_EM6QVw-J8wvZdDQ%oC zZ9+TEdPBW=w$WuH$_pdxfvRHEtHuUq3`Xzf=$8HZv6Y+lfJW_SS~nGqS)(Fq8$M+h zZjxL#P^}lJPLE0aU4jVW*jH&FrsDYR!U%0~-)eP|y2`O!`CbPoYHp;~uWP=%4b1LK zI0oJ(3Jy-bE!EJy6VJ&=v{lWy7Zax((i&Sasx=$BOFU zu?%^0bkwo7;Dl%2C5Xp94`+ebfUA)@&YNQ`d0et=^dV@i7^~EvCB9c-O-(b;HA`Ly zSWF$lx6sbbFdDsa(lk)TiVk|cD#7nQl8!71KTKe6NcB|GYplUk91lEG^92Xpeyll< zgeri>MJ9M~Sj44LFA&0heq3>eTm0ZdEOo)#q8kzCH(p*A2KuLgQ&K!Odj*->qDNKn zvqPHV_E-I~$71Y`8lbSO&f5Oo94G(8Pn|QRjacw{5ouRt`weBt+ATYvFX*#^Ex!F_ zg83~I(sr)^lisuMv`C0!`luqS!3!gT4Y2f(y=&U-zBW>MJJcGYm`%xDp2~eMky_p* zqtu^)wN`j&r;t*fiWqpA=qkqwq_GJSqlwq>9}qNFIi?uI@3t!mf`i_MfClx3%YSqj#B)*M);2&4!_MAlb>LbLge_wTUZ)eDQje%7S)Isq5To*0q{zI}KrFD;B&*o^Rdk`Tv?nY(`mv z<9e$z&yWYS4CT zWB5b(P;cTqIXYF%^jV#+vFqvE@}^(D{q@}3=-j>0ZK~L%4h}ewy1w;6+v(9Z`;h13 zp^o{tH&vv-u82_x9bUkF5s>))d-5NUjp9*_&B#`82uMD}#q(JZqS8oh`4;W2i^hU4 zpJHZV%t@S_|IMU7aRW!PYMnr|EjWK1^x$=!Pm{pC`#Hq9+nEutxX5|?;`*LAI5?(Q zU+k&hew@M!{?CU2vif3bjzdZ%cgB+13SB_&R=9Y*VE-Hd$D_umOt`RF5{MtV4B(R zkGT--f^g8Ss`!uo8uv(Yb5v6^5LZWo9wKket)JfPA0c{pdCoP7;r*~;=>1W#lI;^P zslm=h(3tzNd)H1*m`^&U5R?x)LiZJNNB`yU(a|DEDiG!1e zmW4nK0LtvdLdSl8L@$@K%;zP*D{!2fP0MY;#G6^mM~tW!*FC$-_Jg*cNpLF3l-}7b zC8T7KdQFUrJPg}yBhbidHu_mM&ViT>UC^yB@X%62RLs!0;1TD?wTt&MdR14iHq0IY zThaSmJn+T?a}ltmY>Wt3Ab`u$#LatC;B950I`jl>dH^1ay$|Bt;z_ zaA^tAbcY}it&!W^cHX{@VfwZD^qe%8z_s1kBnr&#bc5TrdzseyPW|XxOJFI?DylV6 zHr{KxvL4IyzC`K8W}%_7ygLhnOGTb@AzHHKexwMJzKt<18mI?>CZC5^kJX_1We}%H zVBMBhJ|!Z+GIW2^4qUl&4(ldj(FB*ldzE-LAiwS^Ex*99^sxD%Ia{)!LT+bu33n=b zp0x3N6lkaPnx))Xq4aP^If3a1%*GBu>&4xb8YrEaDxKiS3Z2^wmU;Ra7=ysX1IBaR zKLcy+^*a zv^m@MTHma7^v{|~G5Ain3lMSs3U6@@L*RY`5^eNVxR@%0W(<@?x#VN~?E^iDc~MYt z?zjNHgM^>Gc{E`BtR5b;!WYn>6^MF0nBKG!`TZu10Za>S8PJqe7I2UCJ3C8{qkT+p zWbFU0>(lyKkKeol=mXcCP8I`%`Hc4E40U=-y|Q=bB{f82PQlB&7Z=K^Ruwf6!p$XDoIocFZG{B_2~~I0v&-U=XKAOktB`++RQ= z2H_2(WZ#*op-YkWtEu)!tEk?KhT26w58i$=+a1?d1oQ;TLj-oEXfozoLv!a_%PGqe z-jcCt$j|Tfw#c~RAaz{sel6<_!YG~*j*6TBzz)IJJHXD#(bZzXy*4qpXbb#sz*9W>T-M03>V)=3J)bK$ z7R0O@$jibwKxuuUZuo7yvOhigu*3}@W3Mh4H5dC7ksLN0K$#va=AgfEkGy1ih*{C2 z$K;~ZlV3=KOoy}qYociJk9x+wT0y5w;L2!U{y6+?EeW)pW>|%JGO`UHRH>^*)m<%z za(=%=Z&9*ro!-%{sp!Eqm{4}T?H;D4>h2=pPbRPQOFf`Yx9@I5k`VJCt#}YT80o6GPiz z-&Z$O#iknQrbh7Nf42Pl%P{J4q>5zn)c>UL%=ccFBz1bUzlv(X2NSPT8;eOF8dW{)q7f<8qT)%2r}li!2W zPd<=SU4$F~!b%X}R*2TQ0rzjDw+Tgq5aV5>2h+Ed)pImZVvknRJ1Qui5dzAtjSu~1 zF8!4a@f8Iik1KZR=jrr+LqLAJIu8!P@vYH<_UJq4s#L<`s`!uCzT-k66|r}Ja9ivZW+w87G`S5!QZc@(<{Slf^lO7~swrS}#1^FF+$ zT5toa-auF#~04L<7H~Q4CMsSUwK*;iU(xAEm5d+ zs0fHBL3@g55m8w@SeL-c{h(oO_>}f>CDB06?z+zOo_(6xNJ!pyo1zWoh*I^75PI~x zL+BQG#Q&(LsPYC{xGNdt5y&gZNbxLk5;@5xQ7iFs;(4!-K&?REp6<@xzinR9?^(3Sq5cR88 zrOw4SH)h1!*s$8Z9Qi_c?xt&@VPQBSd?`_D)d=(pdM~miuiNzgd@&XEN~XyfHru#2 zY~>A2+fRyM#srkjD4JVN!Aly;Xn{3n!cij(KzM;GYVORa5$Zd0UdE-~Y2=Upt%xk7 zO>>FJPO|=oMZFwv`w7KNFz@6O_YBPRUKqy$1+atZ#?wyZV&Y;Fw$HBj4F4lr>z;1+ zp51N{At2t=9YGG@&<1Al`g*)j9w8o~I2%P0b0D)E|FnUc&R$*BGYj*43gLP$E58!I z67FNh*UawaYwI<<}_~0z%rnVds!wGrXO*>f#3Gy$V;uRs#MP? z!lqZBcr4-Z^pwD(>9Kl4wi&O|s^a*US{JI`d8!lA{XeVl3Z+j;ejp6dnuVs@Wp zi$l!*0HAaF3F8U9HsCqS2TGbs&nkd}FV^6?$Q4?Uk8^5)u&SX_v4aLUzt|jl`<3Mt zIy~BoWxDjM^{LqXn-y-t0HK~w5x8{wR^e^*P4r!3Tm6Jsn*;@C-?@03L{))HNY!|x z{s;Yd(;14g1SV_Jztjr~9&ZZ#&%BC14L7es3;d_*LEvp{cX@Yt?{U?;s&{IF@krAo z(~o<%OYcff8%TeQ&iFh>$lN(M{a@ZK+`GA|xsr@m(NJt}dAD2tz66FhA*hK?8!t)!`A|FD3pJ1n;PJs`{k zWYgkXi&pXKqE|#?n=muRq18=(z}TF>H)rYfO*E?n7+&vz62!e(1RoCaOs?ca|2m>z zxG*gaTRrlHc~YysVB}$gp_@2;n@*e$QxNWzs4}YZpP`c1`ZH(N5!8qo2eft-X&vf` zm>;Mr0+vw5OQOcjOFMgZL2^9vtp&aUt8!K_8viUrjnru=3dHaUiKS! z=WDdz1W11rV4GJC9}q1)=8$^C$K}42X6|h2npD^dpP^R>+fnLBl*nD-g{(*kpV2R% zEYPeadLxA6*zep=;$rdV?U%3a0t^H7pVKvz--I&PPQQO2&C;3FF$x$VT<=dc*cL8S zx0jasJVRoI?}qG{eY@Nv;C~3Y{W^8mnXW*ydV8?)bIxOZAhXsIP7BWa6O>T^`U2QK zT}UFRtPs6yFsuS?iOL~CS*!; zIawk&y6|t+2!60r9PfYcyb;F+l!I_-JE$1m{<$5PmY6zu9)P|I%56H-cBh=!RB~va zo=8omMEt!GP)mB83w+O_^7l}YoXziTfm%?$>}%CZxdLO%kO$;nV4pLCi$8ne$lJ&T z7A7RXCr{dvMR4~}I;_qYOQCj_TV2HkJ5PJgLjgVlAU3WfZAuNT^WQHe$Ch-laT`i! zy@yohIy~C=IcU61*ZF!_YL2XeGr=+#7XZ;Z;gWg%!tQ7;==E9L%%$>BK=t5=s-b3> zKZ%Gf=B~!&GF1$ai`$Hg0%o723vfP_^QX6m+bH+du>c+hHf^wEl@#U{Vhe&RPu!0? z^ofW2<+!er@~XZA+TH!x5^f+PyTI(|T8H9~yXwzY4&~|n6Y>B&${d}65s3wdNp#odSM5J7+Y-Sy?nIoU|>djTuamorU8fdbaS)3)NELUk-H5bCiB^iHHo;Ne5t zpPCRJt6A<9#J?oRa$A(rpDGO1KXXIF@AC#YO_$?$WExA8J1NUqbGxUei-^u?S27I% z1gL-Z39rSPwy;8)*ZM8rYXR%x?j4@)0)PXhPnF%;*&p=dC%B&o-J{+-m^Nz(4X1|# z00kTCy@1-DmF&RF5H=)B+DLn#!v!b({6}27DL!}7z1$yyTL`HgTXW1pMJDLHHKk+y zez;q39z{B4ta82vPE(yRd4T1KGfMYGwT1Wp)dhc{+Yw4g6JKzd900=tD%Ed(>0y?f z&ly+A^8hLghw6Owx6FMkeq0SvwJu2YZ|E#bbfyy+rWP<5gBK6h51SW!-vSv0rba+ zG3+9-b@QsajtmE8asg4Y@M3R>?A_P7JGJt8WnkLvLYk_2qk7lM4qbs}1vs!o55ly^ zI+!RRGXoE#kadXtca!!$q${*}f<$M%&Ym8!8I!9SWmVYN4b6sq42|zhrw$yY#^-2t z3B)zf-*Q`4lIg6**I#~hfH1Sq%>-ORP~mXn7MHcu^O>XM&qxg9ubZC68l`ccG|8NK z@DPX@PgiBw+y@TNoG2Qw-??Pt%^4X?m!)j0G*wdp6A6$n0fmNWRmrA>&b3MuS3Oqn z{dE6Sqm~W>ss(TCI`?U^z(xMTIkF2@WY*_MZBxZOIx4TC%+&U0Ll{ZdBO2S<${gq`SA1l&#T32r7k6T zC>P z^?QqkHAYOY7Gh(R$=^s?6|;0psZ)2lBqRQJS<^vq;Zfc9`$5r(q>10b&MW2E%4~Q6!23t1yeKGJ&1Y3Rn zv-#GzV$Fwdf6eUv^H5vqAwV1s`S2LPFZ-}mu*!bXW@cgwbh88kwGl(^pO-m?B-vXr zl>`83q3XpjOuvtYqVA#Yq091Q`rz@<^cf!;dP0n=#+1^{6X93ajYY4Zu^WJtsyaI0 zP$kWSiU80T2NCWg2RzAjOp#XH`8AH6rDbdeqgNuQnT$8q9u6?vl3{ZlB&anS1s3__ z`P@wJH8FzFBU1Hg`8{XXdkRlKgGmp)1`7LNf`Q3qcl7`()>|zG_`TL;t;k&D8Vmas zs>kxu7pH_xgwAZ}Z%h8GNr|!chY2^~?7}=7G5`z!rdfaD*cw)nS77f>45J!YkeRY( zEM4g@D&=|RGh!zSus5ucwE3SrM-Pe*|8`ykupL3?9dTF0Zx9P}aJ(2-V00Y#VfIiN z#4Li(TOBF7vhc7#_qw}E`x9BP5GVc6hffkR9pp80#rj^|P0ds5Po&MuKPw5tR1-G8 zzSOV1!iD$?+XLS04OC8^LMellKdXm4IppH+I*bw1;p4S0t z7@%*zE&0h>q{jl{%#Liz_wn_thR&Kx`5-TYb6imzH8Z)B#L3!SPjDj4W*?nNo0c(Q z7tXws-D`L5m!?TqQZ3=(pTu|%K|16@5Fmv|-MIa*8)EMO31A>zHw`Ef;{|+(4WhvD zPA3BSTv41fQ#PpJ;7PvUjt4&8AI~xOX9phaKb@Yk)3=sLqQ9Iu{;rgGY~WjMr(^cA zMAP(Lzs(wHbfD8tW@o0f&c5Q8z<7JWaxUC+Yrufjj0Ibpn`*m}F$`Q1}rO z7+ttLqlL?kf4M9++tRBI}9qFT(U|AoXzkz@KoJQ*ci#=Cx$1jamwwKW!|pmY|lVSp^4l=I2>{f!7nGh)J1&PT8RDdHhV}}Or|Mn3XN;v8KqYLh9HbcZPI8Xw&-Mmx!G!X?{CL=!Y?MTjM?wp35nn1;6x&^f;5E z@uPEjOQ950^%~NTqyBY9WcvCG5^NF9Pb?eCYNas}P450j7sT9HPMrH?BYTM;1k+~* zm~MB!A2M2Y2=$cql{-wxgif1D>+%Y(n|b^WN>KHkDV&HaA7&J__TQzbGT0II9rDdW zzqITE#8tK{{Y(~pu~h&PK=99o^ao8cmMZG93*Ul-13(sG^M0%|cM!*!0Eclz@u7=1 zojC=9^^__xZn3Mo{5sktMrNPmAAMX-Rd_nn83^yISJ=kRyt{#rpT9@l5aB2tLLX8B zHok*Y@)1tn`W38As8^^*XpkH+Wx%NsP9Ne+kn>$JQ@g({wZm!oo8IL(n6Wb9b;Q|I z4XMs^i%Y)P9+95%!5|V42`K{&chU+TEA}Y7$;iiiaGK%g5`ayD!~w+DgMXYCht(6X zVS58-!awRK!jagafOAigD!sSdgnokr{05YPeo9wH&iuR~!rli?4z!VxVLnk_c|Aw5 z8^`QYar%j-A0w@dDe?nM3g-FV2k_0} z#%DBPOSAX0GU7AhCDU-fedqy%0K6dmmjHTnfcy&UvHeFlqgC;9ItDQ==?Vfv569}_Z@KW zcu>;DA^$e@LO>x-`=M9fG&7`OfYq9`26kAMM}49Z#+}MmkVT=c6r|ox#9`|sJ4-04 zh2~JZ_Y_VWO(&Sf8_Mf#e2UMCF7(jqux*gaKdUBucY&0=|2S53xwIs z)@<5Gx)cFT?xxE*E&TXHZk1s)SI_)fpJE{L+FR=!MzIP-6qP5f$aIaRTgi zdN)w&YIaf-|6EdFf}C%#mFt*RW|>;+W!<9_RunTJOUVVsdTSRU;k#ugbUNAC!clI- zBl->>Iu=a5rdFct#vb+$jAAJi$A8PXiJIM4Fhgn>`7%$6h|k)g{yl2ycWSS$+PJq{ z;-zV9!yZ;fuM-v3eBKnYec9aUGFcoqN4YQFnh`&@;^P0XCe`Ju01y=Y^Z>XZ-7LTv z58;T44KC6{&|hJ4YzU^h%Al;jbJrY}OL$TJlQo#K2;c;J_MmISBfO!ZH_( z{I(EXqlJ4nPn7^ZhVrLIP@1_~!Csj>s;9i$y-M>3^|mAy5Gk(ODH{LpS;rt^10zxE z)l|l|(2CD3Ux%IOcuT-o6RkVqxjSjUSz24rS-rM_DW+pJiccHosrox)@>XBN<9N^~ z@6E(Z=2i>yR1UwrLS-%CmFch*p-7Qj+2ot0@gipeI`_)40|AiAcqFa~9Q+g$A==-b<-#dWB-?UDBLj6@i1rDVz5a%6T7C38#BC zDKA?J{gpM!zZ$AF5_kKYpQB1N5c-T%&+1)FegsT!4!QVYnTu??_$MbkRunsM{O70n z&20L1&-=E~(jmX25q_s>;g0S7o8iH@>!U)6IukRZ=pz7D3@m7n1l6b3SWsDe){=9= z39e|3qRh^a-6fT2B4K~a8^|X{-=lE(VKHMX*(sYB4P#3wB~hmV10h=wD@9J7>iH)V z>J2IWz-PvyGEFS8cv1Y^SlH;RB34!ma^%qPJhZO%z$+M+e@F#9z<<6d!js_&u30DP zGqiO-B5Yy+!|#mI5>$t(?Hfu(0|CPG)qH3XdMZa&7vFx;X$50(c z8slLnCU+-WxS6sO_BXGvSwfi`xykRe(5b~HmUhYH_@ZczyV&uQ&X1tn#<{5LYOC)o z;TQ25#N@qAPax7RPjrgxBi3#NBtGE`j)%;3M85Nkg{ODl`oyPr}?+r5YRZt=HDbY%8AwXdSTNuSIJP z?|~kFSIGc0fm*(Cr@HLSnV;p#PeAh=kY=HoNWOc#K?PrG^eTda^GGfF-*XTnHI}sl z96lsknU9amth~R%Z{}p!)DBE4k}9-Ai!@a3-P$|~^OTcVd`29+Vr4hy!NLc-%z&qk zTWj|CvLtN*G+O>Y9a4%w0<&|M4JulDL>mw7qK*)T*VFqVg?-&oJfVi6{Tas`194Q% zK7`?dl8?epi|r5vdf0+^f~KCefLmHp5Uq?>6GIG@sVScHDX@`ikmU(-sMolYf4=m; zvx2nB4axqG4~nSrIY8lIR4;oV2WV8a|ASm`eJCAHgL>kYjE;M8M)wzJxoo;A30S`)r8a~EBAaP^N=K+ zxd&OA+pwpvnBUoWjy&@BY^;~pd;)G=yAuEJeTJX>tyo@^bhi6WaB&L_{A!L@i}{_< zbz150TQ{2h3@xsxh7gQsC~%{m9)CjYw+ezr!cG9Y8{WISTtuYK9&Te?TqGf2Em%o-6mANl+k?)w;$CX<|JGnyKJ$Z{e~VT=K=IX5_hW5@vrB7B@~o zDjkWI9wprl-d~isges;U>{6~OI9Z%tI_<;c;YINWL+{Z1LNg!o+8ODp=Gg(7`gnpD z)Qf5DJ1l=ixq*L&rpgaZpQou!Z(`TpAq;om+YtyYia&VSHms-97yukt8^e4)WC<`H zY?YhpjgIW0a3QenVodcg#}V0Yw-?^gKblbhn1aWe9%&IP@0_;&m!tr!?9xW(-%ZcF zFk73j4d)$LT`~mG=QU`)(z;Q*&zi^-RiF^*FQ9^a4Ni7<+14v*X66;%v~072u$L zr^O=y=V#-=sPoM6ED*MLE)E~R61ocrNNcTw!$z@bz4s%Wnc%y{3?Xz-R6!6RUK$e#Gxw|9=>8M6e(Y4Fht#rb!Tq|7T z__YBXQ9SmR0I4_2RYXKN{M%R8iXU}#wAOoM=O{PYAWZ?#?}OB)}%B1ooytg0~*EdBz!WiPjyq zGzR<}AAD(_-Y4i(UbUt4FHT^%(Tyw;yaoJc`=zsMZ-AOpERwbXBj++*0uE9E4z`8H zbYTge($h=CMSwGj8M>Zc611Z1GA$X)Q{GS-dO&|+K2GUEu1Ll(SpuhuCJ7E+n)X`uWMH!Ul6Mem;4#?x;swUi@d zY|JA0tl*y^xs`?z1NK^^%0|rbOwGR58|UlUGPu_z%5^d&G=t?59?S2mRiBx05$0#`c06t3whSN9M7gbt^f|8OmlCtX^Fw^QVJ(1U5(k_|@IHZ=aO5AkaZSjX?MTS^}N;wU&J6qzJ4s2yRFvEb^t1~6sm`J_v67LbW zv5xDa_zn2=5RdiZ?hw9v&aCI*fSuFM)-msXlot4A6QP=a7Rcu#4rPKqoDad-%RUO< zefkZWQ6UN{CZH6g(he}C6K5EzQEQ}M8eKn-$5eeeHgnzp1Xw&9@1VOxfaSd9yp~YF z7EF8~c{Sv<<*bkcj?a*oD8S*f$ZKbU`(i|U1Vrhl)EE0xn4%SeIez2r-BebZzCuG@ zE$yg<9CS#abxdgrQaj`jq_uZdPXiT8$7z|Dm#$-bj?duP0pd8br7l|EPifKf^<7SW z@Kv1xPV3@qu`t0r-{%3kUtSB>^6P45Zu4%gyYoxgzc|9!8fr3x2y&cL7lUAk4 zaU$GUF4lbkju@b+hpI7s zfH!DlS)HP3y$6mIe1JDy+~U=^V0_1j_rK*#=46ZB{V~pN}yy+k{`6z z8U(DGSI)fxz!5Fn1)h_Q{cuj#tse3G%$r@Kc~NCu%kDCs0$tcUw+oNNA!4RZS%|!m zkmiZ7<_Tq8XP$d9R}44bM=-X|(cTxxY{y{ocVI22Dx%VporvNEE)#O!;`VHn-4#j# zNU`>sDgUI%!9oVUxPc5ynyG46tS;z48gIX7)VDGn7 zS4fZ`L-(DF{}$QpE?uYU+KrUXPi?uVrF#BJ=hKcy$j*(R z_31T&ehm0KsDn5k+4|T9FnP8x4U^KbYKs*#o_*%C;XorRLg9C%PM*Zt-6uQ)Cz*kQ zwN={RJ53I|4mIS-Xm~A#oX}*slqCpGapJ)J7y(NgO7`W2rVqND{cgGF1b0&dmP7wI zfMxuh^V16Wz6z1YKFzj8Hp4?v?59I%a735Wjy))~f>#LW`J{;cFeB*N82_HO)EZX92xfa^Gu~rn(k|=1047@!Nj;bJdPoFe73=V z3Lv;LQupLCtOl(C=82{iQ7RGgXQiiM=vWS$bl2ui+5kME_}EhQ$Un}z7@aayTgSQsK~ zX0__cdTYnun-Rc-7*}(`7naN*sJ|@mM z{DIEU?AEMZ?=9PeX*Y)3J$tKHjn4q#fL(5-EU323S*W?<6$U}~ao~>C^KjKJy)Ry$ z3`~V4ufR9K$5y}r8qlGiHQ*KHm0q}14A7pmpz-TNbH}rbHzA2v(q1FxE2yfAB(kS` zRWenlz{{YI_KAFmK6SrDqa9Ke)T<<6y9(JyGe7^>sBT7WI_(C}#Jo;_$@!b&jf=mX z6Pg)USH1a;&9`PO>YR|S{Mg4EdU<}1k00I?@_@vDI{Vw1b7Bj%=@ov4^W(VCd}jBG zz@xb6&5Epz)ZYHV{-}S+VcMA)8QYcabM;3@bEj!SJ0$Bgn$iHmlOhtj%$M@DC0BYN zWX5pDXoQFAztVg031V5=#VIQ9Vx@2JUF$2WeSFz-`^CjAEQSSz-!gJ^!x=vKwuCki z&fe#ZZ6anvpppLae9bo z8Vr(&kvvi;$$Yla?pyIp+QFqPFDFmwfP%QqsdKLyG#A2iR<2dU;8%FiKNw$Po6ET1 zGrr=GN~D=}!PmJ3vyG=Owx7NrKWJ4ny47s) zf>i`lL=tscQ;k%H+-B|=&&fVJChK*{%R64-rnLkp@*hg_+Tfu&Nn|U5gvAE4fO7dG z?a(jD0yUR^>Kc&yT?Eh)rgKOUd@sA74HN4NKk;tuh=#ozte204XuH3QOp`=~O%`gx zhYg6cX(u_g+YMPso;CTelgnn3x1liitmAcIZu4&xyD&{+g8V)V)pV5DLI{)~KJp^} zMOB`9?rGj~zJs`&b-w!?A*yqrckegI4Tx2}*173;j%dc|y&DNfA&au>rsGE3zV8^? zgiFu#_|LU@Dq`POnC^WupI%uobF{rjJ4+(ir1Ujree@joot-(x-yqbNwQ#}zjFfh{ z2*kz@nxc2q$)5bB1mieFqxFBm+{IMQC`62|bt4=_X}LtqOoV7LbV=?Qx_zwWA=6x$>NC-4+5k*Z%%Z9mR{(DjWg%4NK?oqO5_EinT9uGRL zyGSWe!&?rwws=)s-Klk{K&;BkJu`5}aPFDAnrG<0U65;qi1Te&I_LG;U(oUXRx`P+ zlfa?up4Fpu^>x!)=*|gIJE6TDaN^lucNY&)E0Ovy+=TlFYzWn?FMKPh=9jKzvKqVaxk=ZSb;}vSdi}?>D zPr=ky;V;+X)~wnfV!TT)J&V2f0L<-koW(!RtB77>5eLiZW;a+_;Hw>|+Vo2;hau>J zDM)l(^cK!cbe9x3ITRQ+NL=K)154;ZW$b1%c}u*whmFO%%?W^Ld0kKjW{#Xx&TqWG zd@z6a_9$p472CnkZ>6I9;vBX)YZ0!Yd~cI14fdl6k#D_CH>dN8>kF1Gd>6Veo^C;| zCI7k`8=MmDL8~~gO&o_{g?}1YX#QLp?vortQl&ET15*W(e>~9~Bx;0-ajqE^Y-ccm z>Fs8FVMzT$kF47SQNoQ@C^G|P;CD4eXgJnv=v*~KKB?Nfo@AtTE3iWgBe_TEkP0SX z#3OQrxlQL8FgA9|)+p*sW45+8E$sQ(2WD^s{gG<~)SHj#Qc&~olnYnSfdTmLS@>_+Ji z4C}dMl+=~=TQ!(tAX3?TvC<=Yz^v=C4z}bl%|;qC^yG8imzh>c%H&#ifGJ_76?LL! zPHK*&;Kp0*a*O$lWJ~ce#1@xeie)N=wpZ!;#K;i^Bl}6sHqZHjtnSnX*2gyTJ*Su@tQ@VM1PzvqV`SkXVoh)j^6{Lu-LAEkUve~zc*P2L5!~^e45xQtWt7ClG;*1MFBp{Gv zO^8Ah1VMoJo3ew>(y|9}CxZ0&5SW)RaT(^MYehN$|KZ&Ap8 zw5f~E{BP$rzCg`p)Ku+;TA7we@`az~=}FP+2SamQoVQZLhIi{b_hPULZa*5q6L5=q zfLmU$IN@l%u?ym?Xu!kaON6ZKBXTr0FxEN`shUtj=)R&K7!nW>YF@r?dSDh|t#0BR z5;!?w{>c6B=Oxp9wEv=EqFtE%nCd3OFwLF5t>%#XM+)-P$+yA~A2yMaVEy4r9fsR- zIdjd;BPGfXKyL6cjv+QWIz(tI2rMY!{_$K35q#}RQR;z-=bReWBJE&AQhRi&;ENV( zy1;}<9}W`oFS4p-`;Hwq#kCZ7oHDKXhi0*v)R^aE&(x{}>IA(pw50N53 zgd=>nWbnAu3GE)J30XlNjDy*EYp;FhhB(8cw=0{F+UM(yEo5lH z!BUC(elIJNf0+bi>hXKa(f&9VOUS=l-$Ku~?cw07Y__r#AYA;};)m>%73U>#h(&)^ z8K6`TO3bEO?1fd|?KI%Vd@er;`h#(086M1;C9a=0H5#cX#){z? zc+K&+;rs}+_#nJ_rIAT@(#VphK!3witL41P`>GzXNm^`kJbBNQH5_EbkhXu{CDm1A zzfPB$o_9_$>Zmsf()Ih9l&GHOhd+YLjkgHRV+O;>(uVHZ!y{rYPmDYtwWz4{IrFY6 zc`&pg;Ra&&&~4{F(FK-IK5C7n&o-{71%xr9b#8IVT-fs=sPB?zxJny6ssFy(^EDcm zHeBEQ-9^PwXP#@*OxKL(goKC|M3q_Tg}sA;% z$l>x^=Bh3lXCG)}I@2GGi|QT$MdexPS-k6IrVn)Y25P#-kbIwn8(*m3i%r|T>@jQH z!7OET#Pt5C7ge@v?6ThZ`(>3Ft~zhSoxZ5IFo!yus4HK@e7!pw z2DSGEC(h^ZE%nz=9-y;g#${_uOzr&211Z>}n!$?w&Gsa_oW@3(u_n1yD5NYzNW4=N zn)2bBc-yamiQ7ZEjo(h!{xm`2saFa_uG8Z#0>TZ#l^$GX3YOE>AbO%)(V)9HaJDli9TUL|x6r=tB}N zg0rhDN{`X9J;NVkI42JFj_qlhuWV3)%!09D{*O0a;#-Qv8IqH;p$-}c>|=_hhY=sI zQMvA97|B9W{XZ>%z7%q+#5=SvN<%;FY5Q2FJBP?LG@I{W8MDh6j)vE2r+VJ59{g)^ z__K>*y~yt(#lG6*`=#psuPq892!fij1OGqw;YXb%jg<(W_BR4qrsF+?Lw?YZlzgw2 zujE@%wwbg%CJ*l!*fu)q3~vnuL*j0_KHi#FFLz+cC}<#?-(MC|0aRQN$Tcma&O0VE zQH6xAM1`8DpvK$|RB5PZih3u0^T`kPSX6bvK~!m`0`cBzc14iJrkTF`i%+8ZWrw4e zSL1|IlDe26zg}@Q6;0@3({$?!iNF zt!R%69=jp`gx$*OSUv0w@V|?3!DjmUC1Om2KwK&rWLIbpdTTmmAU*xr&BQtQ#XB&8 z70VAJ{yOb$T{qfvv}LeDWbm8?;^OdOwm}z_qj(P^*6hapfh3FXWDdpym!qT0A|yj3 zQ5v~t)bLN6KLOgybL~IK_tt;51jprNxLNBKipk0FXJSGKGq>3PzY=mfM{?%Co)hsT z!rH%H%dDD%T5-MbZ8?L#aFe|+oA+&0E$sS@2mUb zk{7U}Vao|$?$39?RuiQ60)!>5kZLwZMh z90;ubt;X2A#>uxRhL+DRjcI=`OjuYBVIw8Z%G`p{1D?hSeX-h-Km*q@T=ImWYa!vnc1DfX zSVO^yP_1ap-@7z6w*?zJ{_lh_jzr*rztG~4d|dZ>RT@*|BV-`SeaWe9OM z?YH$xULP!mmoar2jbBu*sPN9)KKAb2;VP5inH+2VwAK{GF74Sjt?p*jowLPfTM@c4D?plfmdXCY50OG1 z--_9Z^R@ScdEYTWVo@GXmZQPVo4=-CE1dXSfssN2MgF#{95plfx>#0__oE57PJPlx zLuQCrtP=_aKA@T3o`xJL*aS(V5eVz0-#Dg}nDd{EX+v}OAkgsAbZ z#3@5>huPOXdT?Sl4%(!XI`8#Ae@|W9c>gG7!6RqxrQx}7XsIGn`N1K%xiiabJY{%| z6J#gw@gau&Sy<~D&eB8ro zS;=uq_wO33;kpcE8%t&jK7#bZ916LHJA_{2N|c$;tge+YK$s7Y6g{?34Kr?N5y-GT z^Nhad%50Si|teXgLqsUe!Kj>F_@BQR&uXYk_c|`A)`Om@(@R^NCDF0A`vr+ROKRd>|po z{5XDwV`9`LA=_k}>8$Ce;77HSE;|Ds(@rhpS?^>RQY*!O$>}d!4ZL8@SIXzfH=jPH ze4PI zzjyKxx+L+KwcTdV63KWik^`f*Up6Rnv==TXBq5FDx-hAv;g?zO_*2A#sXt26yGz3K zE?Jrk3GHuNu*EI}l2*&7D0!Rz*WP=7HJNo`!zdyT*k%S%0TpMInn93`fRRyfKspJL zjw8JzQX>ShjZ_5!(veO=lirI3Bs4`j0R#*v5Re*5%D3b5{R8j&{Q8o`y_QRooU+d@ z*S_{XmahjfgUW@qSNi18(N!rSeJ*ph7-zPlOr2r$*FeyN_hGBtqbSHo?AS}Joi4XbX*GI+_g$c zq~Pr=-yeC87C9q8d)PN(YK-ZB;r;c*SIpN(I;!CbczKcYN@AtrV)0RUd444*DJKVs z1dbN4?s-(>{0|!%eSJCF2Vhbmb4croo2AK^)u5yLo=O@E>yj$?F6fhV(%Y8I38a|V zEvi*QbIIK3rkVxC8-G^tU)q`B!ONv%t}f|jgZE0_zUh&ucx&f(cxw0aIgpkUvDHC7 zE;go>;wc|`IuV_S53Be}ekln;r|8`ZUQtSnw&|y=pmm*k_P;!c-xK+j>`dwecKCN@ zWz%N}^-9Nw?eBB(!CxK-UtEw9cm7+;!_?Zy+Nj-xjH=8m5WVvib6mF*v0-x?g)eH% zY7B1-ib8b_hpt0dv6FB~5OZuBl3G;^S( zyk$KOUY9;hM#))Q&-S?v_Z8Le)(~3krI|L1f#*X;b=6u{gI^E*PA!CU?>}%ke{$yA zy#=|FFmK9H$%?q?7MSWOHAQqkYCe3SbbQM`*Gk1~mhyEDGP=)ZlA{)N8f2RxVn86O znxhi%es*dV#to_u`qO9Xqf*M%I~A-o+Fqtc#^zC_Bul!K0ggs=^^pB$uSYwQiyC87 zuR0HFp*7JG_!OnKm*gF7#CLB3^CquD3#+1=BxaDvudW*@^!$>co$L(|BQzFhV9EOEa z4#NvK9kJ8G1%Cgi8zib0bQ%<2c6OVYype_=gp3bagYWtGk?-F7?foQi*GDIo?q3Cu z0vmQv+-PI<52R>r6jcQyYZ6>EbQWUhNqey&Y{XD(u0tb+dl61ol8Mq z!Z~t4Yk4ky!j<<1|MIDSADn>QZS{}myen5;7_{z^fvNm+wlhz*5613AG3tw_mgI*agqVQS_ zA)$QS9f8itp#F^^xu95lRD65+vq(fooT;_eg_Hv9=OE3viHQ}0-N?10-3~Q-j?{w( zIkc5n#aoP|!O4J`xH+axc`2RFA^#|UrfII3Wi;!WlwMHdG{wjm2ypB%nBPv`jvuAv zuQ0#kQV2Df?c;=W!@V``Jib$pIi92aVql88vUGOUFXyd)1p-BOaxKn;2=-&~_2+#S zi|VST0!#5if5%d36d5g9hR#Hu@hEyQdi?#nQiy+LTIzPHWEyj_^aGWf zx!o3?&GN?*n{5g=r&j81uXq^{SN8VYW6F{fPbv*uc1*O9X?s+T<>BDW@p^Z9+hA!C z=ckTddYa6NUGO9XObIG7W?5;$HARSw7FDS)+hdy*4jl&0GqbJ@cNUA9wn|NdD8**0 zAyLTTV}t$xR5TYXAP6nFPR=<&(0t2UBgu-i^eyJ){%VJqzd-$0*uFU)P4Gf7M+A?3 zbp^IX$VhFU!kInlm{#=I^$8(DdRY~pi_J)xIiFChnm;45J!7J*Bf_+KN7wc|D7Ju*ifGGX$K6aC37-3`62SViY1!=nTsR5^d*&IdnZP-2n z$tk(c!+$CfmqPf#2@>=91q!Nc%L4iNqf_2o;^NER8tPB4A4Vf{#}-`x8Jqol_GNL2 z-4^}Dk<%}4LpnxKY}hYjMtyFY1uST{??QdcgOf=6ql`exG1}9y(kmY?-q%dTX*xTq z_o=Qn=7j_tF{sgwO)x*{PCYU>W$YR9l~5MB#;vzn`{v9&CPX%^p^5*%nz~r``@5SQ9!b1*yxSXZthBF^jVIG^~gqFhI!Cx&)#t{;@Tko;> zQEyts3Gi!w1QX90w7nCjSwx*ctKUwvHe93^^eD*=ybPE8O4jXBlSILqC=m>bGgWRGXrFC%^mDU4b6v z_C!XkETNE@XBDDR?4vWDU9B#JX?xVUjP}cD`~$@J+l^sK^vX`*cs_#9X7!HOa2F4Lg80UWy8Cc$vZds;7(NL< zTU_V(cmGh8O$`R8H;5TZcaNlB^7+>1JS^NizG!>P*VAbSFw7D{skn2rB?E85d@gD5 zk`zax&PGH@waaI640TBpy~y`UM%taLdZWJxElm#e9~wfWK*V%d{T{dGcMYE@mQ%}C zVU$2t)3)zkFU~WaesZyKZ^Kb zwJMY?37qbz6@jAl<6N5jV1Px4=FT!S@mDBt}{gv#8gLL4&Bf0251=h}jl^AZpLiixF? zD$YFjsom+o+?d_y5;`HFxvF=toLn@z8pkQqkci%EwA!5$KlbjJqweZi{^b|QUJM&y zxrTna!*5R$Z!nmyyo|Zw)!&_yJLlX$FYjD_;eEXKN8vG2yZ;8uJ?c{x?)C364pY0O zkgd)s6t9I&&O-IG`ptc3goQNEgH}=%utf{1jC+81Wo4zgc`s;B8 zN!Z9EgM8Y?k*&ck4*n-!mzmikjP5t~_sBW%-SSf!hKd%_6$BUdf>Kxhm0v(4u*~qZ zJ(`foxr-r#=?o!?*4v!B@x#d-qKnay1GA*1_!QwbXM?9z;mNXXIRt4>-Gfdxu~9wS z9aqM_3?EBav)0x>Ck9whX@Qq{J6hRiQKI`P**^I4@X}~YVHe8~G7JP}L^88Tg?O2}5Xj7%858%Yh%RqH1sOh`-C%Z1bib0{7aHTI z=EJXx0Ozl1E&RN)MFw~&N~OC(im8g=lm{M2ymD&th*uxZ4jWOweN6Go>zQQrb)`r> z-)|?M*mda+-tVwxw)oE03@A7Ca(mwgb)>NKtYNCDSgCZ3r-7a&n6KsKFm2IO?3FJu zNu>Y2%NGVmtHA$4pgrv+`AW(}Ztdk{4E1w~;0hE{BX}K`LkxHt^8?7IS)T5*?oz?Q zoI~L*Hsziy{3!ILi6RY z#n_`&UPENoO-c3IUuPwXXX@2=PWo*~Cq(o?N7Yb)u++zJ2e>oeBH240S)`8Z zK27iA&fHxg_-b@XyR4?Tq+9ikb-y+8;UX=eJTl&#S>x43L^k{j!lrm(e}E3?Ur39o ziU~!{jq9pHq;N_)-^-YG0U+O(CMfo4P<38jQjVFMsz~WOdDD_dRpY6&6e4qlE>$U4)aLswp!jP)a z@PmJFN^o?+CUzCCYD>?w#pV?$c<6(K ztuFg#v|=UXQx)IeG2cxHIwbTXl^5&Zzy9jq!M)QnFWDt^Xl58Ba?o0sf_N%R zIwQ~5=Q_hjS~|VGN;wtm7RI6YBmOV_QAXZIDAm#gB}91}=xJRwT$Ca=9T~>M6<2gr z@oHYk#{+zd&aTV;igWvB>n}2es{@C+nU6$anH?e~|F(=q*Aj@{KVC~a zZ}winxAf>}n2zf|CL(&He|rqo2JUE@9z6Bubff^*82Dh#Wg1lh*EW?;SmBb_N+`2&P4rhdPb%lp_~mA6TEe0N^Ha0I36Cq z9u=l7x2Muc@D6$#lyD=0&{DFSLTGky`$Jl+rM%6zCB(04< zB=k6JuW?>2=+>tkL*NXlhZbP-4*xQY!kM&xDE)vSdR;#nhdqp%R`7^sh@j5`t1`>{ zq@si0PEIi;5rv(w-t*N{bIikC$Fd#;-CXNhOdYvIm2~bbbz&Yer$1?IY+ChHpf%k6 ztMh(NJxg5<>2j3C6{W5&KA--%WWjT^PTGli(v$+L;bw(mGFn2|0A zKZrMU9ABxR-V9$1U(BXEU`)9WiAG@n62raZq}zJ01KZPkeTzQzDQaruWk+RUY;|mP z2}`J9+t-TOn8f@&rQKoSv*c-$e&glPBJ@}S-_}#?*sbImv%&rm%cL}d8e#c}Z%I@D$Mb=d;kAgN+V-9g2=R)DK3wZ>&IRB5UcNCB z()~s%m880T%WuhiUph)j{Q6{T4QWi_5z)h+Rh-VDUm8ULQ$uT1-KFuoSiJXOzzxdN zrE#2QTTVYDEaOs4XoUVK>nqa!A5SxJ&cl5q>0>0v+a?N=pXe)q31DWW-bWcpmxoJE z-XR^6Xu$b!M{%&@VDFJGVTD{oH8T%bq0Qw2^3*Q2dnr&_bje^EW?^w=s!f?Btk}Uy z7DYPu(PITY5ma|uG_f+fGP{5<#MQYl=Q(bx(=JW`l;l$uFRfs=Je*dzTHXJ5h*|Oa z-HMdE%yH%N!aSrasAf@|ZRnN9mHEB)Qo&ul!5V{}#2V#Yp>$-)45uWr-dFC%J|fxR zma8)tM~YV&@OVYAJD7XxHIRzF#1J?bbIQ5~$U4Q+6;t<6MT(i7~?Oa*YE)1PDP5T_bb=Oh}2)z-S| zx4X6$ke_>SHJ7s8xE~<%-oVwuN_>6J9R{6m+WCFwjvE)J%Zf1j^OzA^ zOH;;-s8={uyqG+*s8hIq!||Z~i_&r5lEN*5)iwcWXM6qMXgu*>V~87>639IAJ_7rY zxDn6jTJK~Nx{2O8J^uXY8!V}Ob%n_ntHpMwZ74T}R1_{$UuFJVj)m;Om>jF3gi)XD zxZ5=U^zker>MKTmeHK6o$(AfzowhIby_2afrDI?~cDNu772?^-KiUMeJjocz)Hx!% zd#w9=@lzOPnZ#+xqS*CCGjoJvXMi_nuU2Q)SrD*tu$2FCRM9IrUO9GLG@4O1%*3B) zF52SqefsKQcnapbMy`9sN}tob@acF;Q?muF-ohxBQwZ04T-b2E5-jt{ zmcoUa!KPO^3IXqP5n=-)CLqw18>o<5lp9|k#h!WhEI()+poc>?LvH}Qu98}7xlofy zzsRI3qS52;eSS|kXf$~?d@~-FUqkaLz%kwm0F5O zvjjB%qDPVrf>Uvwp`O;Mu|O6& znSEOO*4-5FRMttq3R7HkshJF8vgAG$>pm2hvv!`nu|t6>4-%T~Pc|3rNPmzf`uJ9~ z^S}ksFMvT^nDc5hLw@J2qQ}b#WVTm+V`C(4F=vef!}?Ud;OR2m<+n;Cv{a=LSXZYZ z@rY_PNV2+nzge3-`$_sG{uQ}9C*3X4n~!4W`~qhuQV40^Vz^%hSm!>4OwH*h^XJS^ z-$ObJyt=#T1%lAC&~z`WX}6E!fMNh${j^P!rhtKB2y&z3%FN|vI*)HDF`yJc+e;8z zwqulwM_E_BdjdoPA5Zf%9Rkecu{6-F3z*<=jf=`(=FLY3wH{wF@jKQP0*99));oS8 z`?c6$Q{fhWmBl#ak5*{q-TaTco1OiB{^)Y85ij=!2J48Z!j-~Ggc$fbh!Tm4@pP7| zXzJ^zn!)DG0!bk_m30qY(oB@Gi?j;TGI}qoykW38Yw04_=Y@%ZZ681}#@0J@m0iaZ zd(x4FUVF+>g4cEJeB|rCU+_#tv?ZExMC$%1z)qXPgBE1{6z$BV5V@_K@Q%8V+>r1l z6SBe}d{!zxRPAlNx>kMb#1~G1FORB*a$d(KkdDRedooB$nwSX&{M9v@r63~3r*whX zix!cp>UEjnt6w7u;)bmE5*-$}m#T0c4k2V~h62E96;Q)cu?Y8#{n>$8&h%px<>78Q z58pzx{HZ>QOSqk?TJCQGA;z0TP_+vB?xoPCPbP21J4!v5Ze+@8{pECQaTP!|uwdrk?Pd=HV^an{3W<#HGNrgiW9%7@MkT#W0Q4vaCo08|nD7Rd`1 z9-V=^?g3@=W8O4Zp$QLGe-gQ(ZLLAM(bJnTv}7RJfX%$&#DN(96Fitj|4?)ZEcHOZqJnVU(Z*(aP&}ZPq@%o8@s#MwqviIt*BP%gRUCh zooA+adX`3DYy4aV*?fQgUSkG89~@I6sir%ZKBram_z$LxpI8hFc08zj`*V71^b1sA z{PLSq4yFKPHoMKYNq7a6U}69Y0yMA*IT~LPbmQx(;^yF4EL=b)Vc;{9W$tHHcw3{K>Shcw~-~ z+0VT3UaVU=Rj{qyB^}-W`cv#Pm*fEboon&Gp1S9Zi83+Y2Dh9*C?#NnQ%qUWrAt># z0(J3X@uO{iY*G~Y1t^f^Pzj`q>TrDJVAE?o*TNx{Tq}fth|U;EIM(L&AHN=Ua6o%% z^!S6=sj~I}^r!7Ay7Pz``jwK7fmtlaQVzJCJ_mV?g-4$Sv7~ptLQ>B5YOPxXb$|+v z6*$zd!-(GR9q%pkwf%ArAUS@B*C5E*j9ch&pA8-^YEPGin9=Lef-v|@w+@M+m}N8d zm!Z6fu=SprvTrPrAMM_6JSGQXwa4H4@yvf7{zDP8qCQGv#hz#`Xdl-Z8?Tb;CPjBe zLf4%0yrLtQufnb=+^vv2eF-n-PJ3cEcv&pP<8$7>i-eX}mF`%dJZuHB>R-O{s4vT& zN#Mai>_V@1DJASIE0!=tq)V4V@WMtrw<%k3{a~L$H>poak`ta;_CiVn7O2X~;FLei zO*g^wRy0@iwgRm552cQcuv%5OBG?nQKh*HUUJ3}rjc$!m7VpH#uU?DkQZCukI(uG6 zg~A3dmdmDkEPm=JQrT5p1eF#mr6K(p} zARMU*eoAk)k>^J%yR>KI{uK4HU!M+=HB5p&R9}>I2ZFC^$zd-GN^YW~-CIj1;j*3^gS1M0zFUa66i0J=s7?FL3}!U4&>^fw=9W@p?FtGBT9&YTF(CCj-e&> z!~DbX)$aZBO`71T_{F?&u0HAJMlD@V9XpA}PF!SDz6w{5PK4}&g_AZbc{WVM@+U=4mw zy;30)8Y^@0$GFY};)T%;iILah*jp(i^%C{{HXquZRzG8}i5`7qYD6}qmjnUJW31LA zHZPnenTkhh#hfe3&>OHYq$Pv%MS%kz=2D7q?w6_2*WTv!FQ69ym8tpWJk^^|j!Gdkl}w&4?mr3sP~Hr|-9{#t8y%>d%Z;D7`PMe=G6v14E)KB(R>1um zR0N78JaY1}Dk|tBcpB`Jpu(o~a<~b0U>s^-Z^n%J4Iwskzfjw&ghf|Lf?K;BRM4RF$tf8H9TX71_*n^A*1%mD3nWnow@;q!Y)cpPG z^wB7F`~LK(MaI6i+O#NsG`=x6#~!=xlBV!}7QkZW^Dv2IZsCs>hU-=e2IIRHu;%UK zE@{~tEU%;qu+_RDI`8)im~2f@OgTUjPSDf!?A@9}@hMU%dt*BKd^*X6dm;8I$8*0 zf5*4vBX$~VUU&RsQ_1oXA*rNgU;bXGENY8?<9t~@rnxeES&wabH8xGEw~}2z&FMSG zRPQu%85z|v2x_^jj(Fr7B`%o!DURvL_H=p0a?s>OTlUFc_e>wCR{^#J2^q?kByJ#n z8Ehuy=v@WdoLQS|Y;EY^>IoDspi%V{Dj96zxb@5W2S4hn5#M-o-TAraG8~cFOJ}2k zyDvxy0i%Uj^Wk0QloIE4ATZ7+n>!AuIW`RI((=MP@Dm7}Wr(Kr11-T{wM{;i2LXbI znoVPxv4DoRSlJ`FC6)fh3=jf7Fx>mN_+nq7uYwFbP|h+CfC^!$d`=TvSD#Tbn*pV&GK?6xF>BNdcQ_6xhhM7tC zu2ZQCRJlTxmv<|wEvzh_%o;n1!hODovw-xjm95@X)oKU2aY|RMbnQH8DVFc!1-2ID zI9t}m24ze=wZSp)|2AKC5HQCY7&R@KAQnFkERT3q2mvWuuOI#R_^z&(U!kwSce1*d z7_0%TD+q$?_)>PV8aR~;cF52tnY^#2^a?V)^B$jHdM_9Ng%OG{AuC0&a|v1}fXqR`KxLn5j0nX6y!hG$wn>uu2Wn}nKy%cTo96;qA;TEc0`{lTz!z^MCUwo|z~qI^?A zPZ92?0TzE&yDAi93grV&8+?2{ku!g-TvidF9CcZ8mfMj4bfe>4EqncC>_aCAYPX@! zrjcMF7TJjyIoQmsI)@WpSZo^W-|nIrgnz z3Bdft6)tI*c|i?YHk$Qn?Wz1KkK87wq`G*91p6k=(BD-P_P}N16BM!#a^117k~TUU ze84nqFu6`*+MY0m_!^lEj@mt|p^@r@5B%9I0ReY{@@d)!&fg zt3i#Z4%Xuv3!k$S?Kj zZ=tsVq%#BWd;l~AFwZMllub^4vQwLmyf7=2VlJd@JTEDxqon1j?`)Aq1O?C(8>VgV z_j1V^lB5l#NYj`5;ujO-*&(B56%bY@{Ynaa^nkG8tBKa^(p_lr#`4@4Rc9-5oar3{ ziPTrx>|^}<{2U%xlw;ptQe_IHBR$#H_J4)KA)AXI$WW25u^DBMs7j*~42}KP)*hxF z`n@EBq2qfp&N-FEImJ1-ImNZFCR1T9ds*i5?7gQjQ`1L&_#7B*5@fOcm-cj&gP7ia zIM|T~Ixy1(r~6KICn$2SLt&%1(pKNxmN%D#w*H411bCIkn(1*RW zte*|-+C~$I*lQEOyvES#sgs7D))VY%Y$=4fv8R!Dl;7C#B&+0rUR|8l9k^$i8_b=S zTcRmy+B#P~4hA_!TP#|6a(vY>$bY#!6sb5SvR@W~^wgI?qr5|`G+p^84 zZS>F0#xQsPL2w%Nf2+>0g0tyK@X@4pf%nF?Hl{0iS%m(xDc?k8(`8lVw{jpg-=1OO zr=+)^jTxWrz%UCg%x>4nw(6PNuM@0BZ+(iLNd|(Gm7$CW0~9j?b1>2-0hwp3%dDke z;+kFS_&TRmtsV>MeVqSm}57Rl4o|M+$l2?H#DfeeJdu(m5$yH*PWp#L}el&n4Xxb+HFx zpJXM+)@KoBlCuOWHjn)xwp6;Qx+4MD$e-#s_JX-%j@Y5pE-E>uwvvoC`KzS+IkARC zx=&aBBomgVTCSg)HJgQtqLus?ZA@WYj z1-rKF_;O#zi+>-hB*H7dGCPM@`8k7t^bn_tQ#a+_?(zH{f_oy|yLxPhrVch;G+jw9 z15MH9GWjV&Wm0tjcapTU%A>^ud`rrP`diC%u*L?RXE31Q_y#c%BLg_T<*FM`St<~QQWvCqmRlmb@*kW@BGH(A0Px8`?rRW z6C@62+?5Qx+mDd^Oj<~XmnjRf0VYU*AUF2d`lamdnJ@pw3*IT>`w##=C^_@?lfzt> zn^SB|nP4ZDX?w>+oqr4E;NU<+-rcjmKYOCc;^SHk3L7__(&}|c6s26!Y4Gw{3^71> z5XsiT$L`9Kgv|xiTqYvFf>Y<6=AGL5OGsMq4xi*?{xip(cVgflS-&vd2jBhUwyY}p z1t7vcL(;^cza|zdd1X+MvRH_Abk*`#^YKU>*m!V#_Y#k)QsyZ9k(l!K!TyMF;CviC z%q?cf4uJqLbf&97c@d8@KYN`1B#scx_kdtP|5^*fO@4)`T&qxx8rjSih(QBPDIF-~ zzkYtI?Pf!3EN=&8F4E?;hnAx0-XF93Lfa^Ikmr0Blk#jH6>>c(4aH(#oHF#G2hu3| zwvmo$kqO|aN6uV6!g)B=3u<))v18zs^>dPzU$KudM^S_~el+`80%w@c2b!PT{06QlI z0N1#{OV|3D>AowxcZzfQIWkLYGKW;8T5RWAiU6O#VsMaS*+m)t2sPXH^4UBzMo5}i zH|^O$W%lh* zy{|Ea0i}{LDI|z;GU>k)aO};qu!x91YbfLVMq-g7a-+u|Uukz|?BIy4{<+ekenxV@ zB*d6AoV@vV;wbiFyZIXZ2C6jLGqorT2qNVRVuQ`Cxg56V>p&m~0WF1Ud89ieVYIRy zk*&vSv2V@@N=r6$+4))EEC(aa=Z`CiI2a$i^2hm>9J)~y(p8k5S0i~1O=$uQGZeHW2@ay^2tZ`Fk zlq%^EFW8%m9jsj+&iA^0#~_Klss-dLTqc#gSK(B)N&oW~xY4O7ncL(>-*v#udiggK zZb={B_VTc9t1aJyE98GdZKUP6+0QbqC+-}EM%MCBoDl)I5Y^X0_0Z*4 zEJ!$njKm8=iiC1hyyBrV^FhP9Zw?Q~m-F6#QDVd^EJoEu)?{BipHvOmWdYJBH-<1`GDw5~LO?f~kZ6?<0kK0-tYDYI3yx-IN z9>O1ufP#>T|IXtDoEa*{A^+}EU5}O{qF?6*)ry_WoD=8Tw*EPtbagt1x1(oUP7r7Q z7z>nQ9%mu8P-UYwYVSgX5SyZ4Z8WN0z4b&ee?Yl-@^sHb_X`y_ciu`)LcJVuBb2uT z;yX$9#%p1qF0+7sI}S;pBo<*Hd*oZ%mG_&8wCy9gvh%Zu1`EoK?vXfxS|R=R4u74> z*g^KT6eMa`zh?DGC)vK4+adx5IdPzl^u;z(6nK9VkhPdDkWkN@VL)m=CI5El168d{ zN5nbYN^0|*%-HdcN21Np8sKoI{aLqVjNdr(M-$g-C6GmLF4_B$q)ix{51}}jqij@l zEVeQBjoD+9cHxS)_ytIW01bBYgdLyxf39`&9PbscxK?*9?_LXF)f=I*sv_6MIXENO z??eM@S81@RWKICOVhmz{n?Q{ymvDbLUBtXbIa;s=!^@coCQ(h4i)~{Ugkee?SAf9P zK5icJ$<)SV*4?*Mf*@HEdqCzw)kBDzTC#u;wXAR_hDa}1d;0AMCmeT@Ez!ooR+f0RmyhdFIQns_wAYj75X5&F?R$&z#P7_bQzud ztNTMKiX9}k$X6&wUy}E+`N^oAhif{ON7!$2D_{o|lVPATm`?!F+pHOYQrn9uvO1?y ztWJGUhSJ)J?EY(c^fH}e;x#tbX4cU!n%TlvmISaxnh_(%J>6(A6;Sgu6B?j$l}8kF zH;&~W@0Eo3HKvnl!Yl{}XyWCL`p;Tu;srfTh4*OR5`y=bqCQ}Yg8AQ%KRPl8<&TAQ zBmCKK2Fn7y9}px&XHUP{&#$5Mm%vou##ilewd^^S%{f3bJvFrB=Gra?ia=FOJG^u0 zN*pq0rU?RN2cMt&648u+-eSSp#Xi*`I#F?;Br0{+ZF}CBfgA;tN}PtO zFxdunDe!Zo)=z88!I@W+xy3a&SqAG6V3CGkH=#N{Tz4*X#ph!pCLR-?m5H0Z^*99qg zJewC#%6kLk5~mw2EilG&4z}=#A=K<7gDeB^?mOOGw2ZEjhO%4WOI?zxq}B%7`@wf6 zsgss3C7mI4OOjtLU3@H;y2kdaLZ==1MsF!Xo20#Ph$fYt7XeNv?p1id$;4H?cGGc< zn)!VK4_>`Wb7T2kEMC=#oyNVfbDr1n>)fuAZKU*7j!b?I+ku~_BUqbybHTC-kj-S>78{~LRd)Zg|E<2SKD1;Rnkp};EXF{oheEetk-$@IRCY|UH`=XJ#N(o)z5NK%eyYwV!`M84*! zPr~f0mqS-boK_&u!A1ZLT2@nu3lk`4?xd%E)BBqCHScTAiFx&|W+>$-~|c(QvaZo_zYq!B7yW5knXW2AX)~0d!L0 zqz%<=H>+zhoiv)pneP<@m(F{y18ktn-cAu5RC=yFqL)LLjPgc{7LK1YDKxq|q*K^m zk_DkSK!>y^^~3JKU08&rq2*<{uv}V6E%zvij}|#=&bUokWOX%E9ZwV!i)Tmb-9>K% z_}JEAx`=&B)<}2vcYZk4`SH=uIZ7pJg%fKo9wIX*MMBCad#0&t|(EzR;{=mmf73Mfjw%{atY%=0-WvI?Gw=raoFsu%=Ynez{=oxp? zW;f~pnxr`jAPy^MjN*6c%MKxp%~(QO%DyIqWVx9dw!Nw>-Nvj5w{s|6=nf-koodKZAs3n0-QptsNVZ1 zi<`g5<166>T_ED`?cRyNnErV-`g}e@X^;6w1EQrtK*g+1pe_&~SF<{^K+RbS<;33S z&7$t{S&)+tyy@>e%-f$>;>rA%QZ4`s2x)hZqXn$&3s} z7gs%%)aw3}u%hM`{4RTho9K1t3LPnMqrE`^fqRAgH6Q1CS-;e_kzV{8n9Dy}{#24y zS`UfA&34w_RTIegO#e9%cU$|NY1+`~Z#E~KnroC_>zS7D!0_$QkA58rn892A+Qh;l zZ7(o9G#RMplM6O>du?BuILUjnPI@izxR#Ip7tVKJajDDP;hVIBOS^aXs|dj4RM;hk zP-N)fnYPvkrIkHhp!`WaYY#Zj!TfBeN@qXU+E8$rc{X+b{31c^)MA8atk8Zn-^q1# z&w&s)Up}@!gd>3EZ7Lhuq|kj;)&t1_4VZu#y-?Fp&|e*Tx|&jI~+SpRp=b3cdhzdXS*!_WWx4E^~r|I3r@19Grc z|Nr%K|IhdS56`PVKj43P{)a=Jy{G@nNBsA_|BF=p_r3p5wqPSTLfMc1Nvi%Uk^hHM e6&f?gI(Ge#)%e9=lRWkav^Djwm;7ZL_WuE^{5#YD literal 0 HcmV?d00001 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 deleted file mode 100644 index e6c7c59e8b7007a239a4a79043ec3ebf5b3bb04f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ST)>QAgB12no(xpMxXshWF~mZ! zH+Zkt;RF%ieJZM3^eP#TieGTGDh>F>&=qi8FOQG&(FL(C5zQqtx8yyt?r7qF@IcAJ zvSiB^eTAU*8B2~8dwG4n9HQUyrg3Vm>6~eXFjn%9l8HI>CVBvW%tdi?ZF)EAF))s1slbl4uihQ3(xQ z`m*F#!@4zPyKTEZ3n}$ImT7QkEWQ8z@s69@mt~4bIp4@Kk@{YIz-P(jmup_`s#9#) zprFJs=ecpdNJ6>&hJCMhJ%3Pla$Byn!o7zayVsoi_TNaZKlWjU{{eX}0Y8m~1N&Jb z8d^Kl`)j(Ugm3MyS?9WElSB4T<`YZxg`TYDHvfH8G3ka-+ll>?SY0N@2y!+2=z7k3 zL-&VurPCbGV>==w?)h$vSd(zK|L3yvKa5UyeE7cb5zFQ6zL)=~b>{!-F`jS6XI5Cx z;dIq=Wyr6d=9k9v#1!Kd3?Kcx+*YyZ^cH`c$|u23xMo{DV>6QA%!+vFa)09bvxY|| zyYIV|we{Y{U)2`tI}fPovv$=myg9miasMCXylssZ-TaJu)&7g8`@Yb7AiPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91A)o^Q1ONa40RR91ApigX02V-i00003F-b&0R9Fe^S39T^K@`nyK140V zLhxZFmLeJu1mTH>prV3>rco=g5yV1XKASXY^74CF2x23OgeO9ZhoFTa0YR|Q7!hpb zfmKwn5W$$u-*dul$Y=91yO6bU;4(XR?%aFk%$=KwO@RmogHE5%cU_j{l-upz)o!gN3bc^05@O-$MgiU5|78fO&J*| zoCdlnRVtM_<8ry4LQcXtsh_f;Lf3)lC6GS?lK7hb?;OtbV(;4n^mLnrQ6Bg__0KN!7x1-VM zCnGz<;{brGaIg*shengn$iX}va|eF*gOQ7YK;V0+RQfo%W{io|)z#h1eC+-j7D-0Q zH|aohtR-z9tUQEYB^HbQ(AN$@WV6|2DDMKmVXO4(PG|Ka$MXR;x5DA@YuXM#fc|qp zx(?Y%0E=$S6R`0Mas_$vLIMMOK>Zsqu+I(v`UbUx{Q`E5$vC64b^{;~ZkTZyA15Fm z1uZ&2TYJW3d>M3jY>hk-jPYgUgK-U>FkaM<@#RH1H{MIqd)~kuuL3+DE=v#}^xLcyJkvRW0>fwAbL@J#QmGtA*}cS`W9m6?wwVH< z)%<+3*$gU*QqkX$>^Y_$1t?EDGffx-a{yF-g+vmGglZIodd}01_M%M~gtoilyvM6H zUo^vpFbHNocK2CiceFEeQ-nci!9^b%qILtfG7?D`2zDoQ(4uxk!1(+Xt+D9*i>4L3 z8bNHJ=&0yz#ld)5+zq+WXuJn~k31gFpak22ga8N25#a%=VKUN0K&aMJNDRVwOTGD(bOLoBj#ua p`#k2xZV3|>Qp5Z+RM@xr+P`o0qZXrzdoln3002ovPDHLkV1jVzo^=2K 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 deleted file mode 100644 index e046a375c8e9468da5e21bcd48442cb4ef4964e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1339 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 P_qSzh?PyhN;S={C!@p2x literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/emergency_icon.imageset/Contents.json similarity index 61% rename from XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/Contents.json rename to XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/emergency_icon.imageset/Contents.json index 95c5831..24a896c 100644 --- a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/Question_normal_icon.imageset/Contents.json +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Image/emergency_icon.imageset/Contents.json @@ -1,17 +1,15 @@ { "images" : [ { - "filename" : "tabbar_homepage_normal_icon.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "tabbar_homepage_normal_icon@2x.png", + "filename" : "20250703-134619.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "tabbar_homepage_normal_icon@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/Contents.json new file mode 100644 index 0000000..44984ec --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "decrease@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/decrease@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/decrease.imageset/decrease@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9db74326f422438f79ab336cf1ca2e7259249144 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^SwNh`!VDz6Vxmt1DT4r?5ZC|z{{xvEjLf*upFe*p z%gP@;eE8(?V+{lA2M&ryfExHqg8YJSGU!V2aEPc|D)C+LT)xzA-5GYE)C^A-$B>A_ z$pRuGhDi#n8rED~eXpdhny$(YxxQjuVC>>uZl%1Uv48#>9^klU`r|Q@a4%4ut7z<^ zm(m^=j>L*_T%7u|fhD%)@`7Dr^VJ-$%V~G$Ic~Sy-g#}y_mnOLm++8fLF^kHGH(T~ z(7TvA?dg%GlaY-9u}zAnFLkg+u4^)gZCZGQ*|9@U=-`HHtPD@@i5dHCN<#N+teX&0w8EAY6ObBM8Cnf3qw z_0a9s9Ue;y{QTvu{I^w{lu&s1e6A5i(md!cRS7tR}ND?gu)lP&6d z?!d=*u+hb1yZVRqE@k|`%C-OAiJR=d(z@xKdRdo4W2dhBrVUC;1qs(?D2c>fKjX|I zl~&`a(wUUR@I&Ft4@W_99@e~(g51KY#e7WiM jsrLJ83ON6)a@lXcPw!uj&3YkVm@{~~`njxgN@xNAykXKD literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/Contents.json new file mode 100644 index 0000000..86ca652 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "increase@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/increase@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/SOS/increase.imageset/increase@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..568bfa07b13e9a34a3818ae9cfd28fb5c4e530dc GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^SwNh`!VDz6Vxmt1DT4r?5ZC|z{{xvEjLewm&!0c9 zUcT(_?tw^Y7+BxEd-tEzx?G?JzLFrn;F}Cg+)}zCD(n{)S!>EpW}GVmlv(HL;usQf zI9UKF96No2&_@TsW!@f(56_6WaB&I8)umT*rn%{OYzt_5A#};$v#z>WjAvd@%ZsdY zaVH&gW^6snw8;B#jym(lgt8)Gm+5brgh~oy+g=3u&395bR6WB_tXLNqyLgvdX<(@M{oUmtR`07tG2*kbcnq3KdH?;8x@x*A`^9UiKW}>> j3VUBkvF-XN%)}APaM?RcxLwN+6gUi?u6{1-oD!M<%^h+( literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/Contents.json new file mode 100644 index 0000000..20c46c9 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mineTabBar_nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mineTabBar_nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mineTabBar_nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/mineTabBar_nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/mineTabBar_nomal.imageset/mineTabBar_nomal.png new file mode 100644 index 0000000000000000000000000000000000000000..54a8013d79ccd4f7418fb3348fa88d931ae9091d GIT binary patch literal 949 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 Rn2!Je002ovPDHLkV1f@C@|yqv literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/Contents.json new file mode 100644 index 0000000..fa157bb --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "monitoringTabbar_nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "monitoringTabbar_nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "monitoringTabbar_nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee7847cc2b8b11d1a37341c9b347fd54baa1fe4 GIT binary patch literal 1019 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 T_v-a500000NkvXXu0mjfCZWBX literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_nomal.imageset/monitoringTabbar_nomal@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..5169b683ace6be7b3041b5954690b0ca574aa324 GIT binary patch literal 5040 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 literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_selected.imageset/monitoringTabbar_selected@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/monitoringTabbar_selected.imageset/monitoringTabbar_selected@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..8826f33f33c1f25ce1be47316c1974b18fb62298 GIT binary patch literal 5642 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 literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/Contents.json new file mode 100644 index 0000000..f7e3b84 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "questionTabBar_nomal.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "questionTabBar_nomal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "questionTabBar_nomal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal.png new file mode 100644 index 0000000000000000000000000000000000000000..464a139a75ff38e200bd54bfa58308146d661191 GIT binary patch literal 998 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET6P)S5VR7efARZUD2K@@(wEmDYq zLMGm0TH40C*AHiZ*ey**(w#CG@Y4m-}}DVo%aLqp9gauev74}41m`Q0+gaX%R(GL zy}z-sbo?j(-wIf*?M=yK(jy3hi(#000H&N068bwPglw`bJEzfTMnfV0`+P!*0?o}X z?a|TqdzlP>*Jw28+S^;f;b?@asw*PT-rfPMuCBq-QUJEMBVSc2^>eM3JPHPbNBM+g z+-mKtH5!{<+icy$>wQYX;Rrpf^4Qvnh&DExlb{d!%0x;FJUKO-YHM>7pKn%~RRKj? z^g&mQ)8{9b^w0<28aWgN@IpE6>Y>;BO!6ss#!t#|jfco3iLlZl zkx1U=I75ZUb4!AN=Xsc%oP_1&Wf_we>+2t2cJ>WqG8qX1^yRqP3gnVOTwt6V4EA^Z z{SR_Z?eqDFTCFBltCd8fQTf@y!6E7Cxk*f>7BWA-DC4;3@4ruw>oj+0&YUXodK%|u z48`n0b3lBHSS%*a(lb1DJRXN+G6ktrN`l21Igkqz69KjOr-ss0iY>3M7BSHf|J-gj z3=a>3(P)I4ni?6$d>9&f2%kTH0jKktjN_uJ3OU#^HRZ&;D8Tcqz%V3}PV*`Rr9rb4 z`uh5$ZO-g+b?5B!ZNyJhR3sb<0@=ljyXc5U_bG*NOyh&rt6z6ux10B9eF-csu0SG@ zxR6F5um<$5KVdPbils@I)e)^MGMA)3Ml(j}sHG zfL2fGc|r5Y$T(1uZzUy~5k*Insd>=hxK2W$%|Z??+GdrCp=@&b4G>JHGkTq_60}+@ z`{y6D*ulWSAe@}UeAM@Gwx<}T2-MfNaWt{qy}do4*Xy!v@~*?-9T*#X0i&biNIs>} zl->yj=W=?2EI?Uo#l@HEXcofE%sfVdA~9w$HXMu=zkh``oE@>@R8}&y;k?ZuM*_K{ zSuE|HG}&I#0#}h;z|N{rT^a#@*D@K4rPa)`s>=++D<7Y#rPB;4r0JhM;6LC01jDwS U%TCj}g#Z8m07*qoM6N<$f=*+-ng9R* literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..ccad643baa77417778f1580fa9154431a5ffb63f GIT binary patch literal 1847 zcmV-72gvw|P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NIp-DtRRA>e5S!+xbR}?<8fD2WM ztF}doDY%P}Mo`>E9;uar#vp;Vi6AEUr-_fGe{5~qSoH@nn#R6}eOPPSM*V?6Z5tjT zl_JI(S1OdHs7YZ_d?0NMvdU9-+37jcy~E7z>@Ld+>km#cIp^Ga?!DicxsP+t0L;?t z8}RE5aDKIRG}h^KYJmCa9LHtxJfFyM5RY;s&qFwwpgw?dFV=OaRNP;7JKqRkF`CWh z$NrA*mjgPTeig^5b|8q&_(b>!#)9@0=+rl6b91YYZAJ4bIS?0@vJ&6uA$+qrVo!bu z*jF8XnLQmHf3*49jZY55#AJqsgbaOzgS?GTuynBK=qOmbHUsqf6|i(^3`9jmLU{N* z!DL`y5boXk2X5TxhUR7yT)fx>w{PE-HYeGJ&zDx~+&$gh=SQ6@-RYBdAR%G(vhi`g z0y|p4ItvO?!N!g2p}4pZl9Llz@uaxPbQMmVI1P1mzk%Ium$ot4?c)VqU4NRTh3@1@ zIS?18PX$obVkZk(M;RHbVgLU3K&y>mMN{Ht^G!H#;1e(!uSnbX0oZdpJ6oEhg-Wtl z2OQuVu<=~#K&_qw`}XaI&70p;>Tk+rm6cWK$j2}`DsD_e=tQ|2P9eTj8GE&S%qTd-xzcBvC4T-fRE7PiVA3Iu<(xUgghi2pluBuz$MWy+5gaTj`2e!AUR5%kma@pm=V9SO4V*joJL^AX(W2<8 zzP_G+SpnmUUw{rNG!UGl-KL=6b!IMNKa2;;|24){V-Fc++_{K$FDYEtRn1b zw9nVnoc4RGln&^N+||_$xw%E+Ie}rvD(A4n zQF3w;P@LtU2#(WWR4_p@2QVUhja98#lZJ7;%MxML0^ndp|&{FhQ*UY=A{ zl(Vzt=Sf!98bv#4p-v~m5-+Wj#q{_EUSO3J&wHcN(o&#>+t}C$nVFeDx;NUp_g(1k ze+W%Y&5)X^2hzRK;>98?GLc_^$VEOV_SnrQJ zJFkdwhHMI<1vwy)%{I=&rQEKL_w~{VS`a%z@2DiGsirWilAyIUq~D z$i9Ht+|r7MJ!DL&5Tmh~wF?+Wz?g=)ERK)U9J6{8By#|Z$^JB}K69p;i2>s+Ep2f3 z?magCL!R#!r#TfmJAff8cZylp*Pq8g&2zNKY^RHtm;Wqw&2jvX&iPaq2OQ}=;hR~l zRtV%*pbJe+%~{a_%zu3)Dh|QL0V>CN^ffa)b*ci$kw8#M$zd2DX9p^O*7-I@m=qmQ zt4GSQ?mih%PP4YQp2QiYii%(0@?~)ov0)bceI)>j4qUr-Z48Z%um(qu{=mc;;cabK zL3+`_8F9p2=33DKLWv7T%(!Ya5i2;jKIUOA>vYflp;EE2QVJQgD<#TY$+fd92^q1V>+0c@qZo#ig)e^ zA(zx1w@U7dv9V`9^fc$C4M=uzAUK#$z&%K?qn`~)N!~Br&Yk+I`}32}#R1HR-oo4{ z?O~z50`bKj(>?tNyb|~LC;yvOr!(Z^=lmW4iT}iW0q10EMX-YimO{!7>{s~FtyT{k l9S5e9`K&to24?gP{0FoqWSfs}S402+002ovPDHLkV1jVHR|o(A literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_nomal.imageset/questionTabBar_nomal@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ef199a90e68d106d6cac171b2dcb426132fa9045 GIT binary patch literal 4890 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 M07*qoM6N<$f^9Mw4FCWD literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/Contents.json new file mode 100644 index 0000000..2e7f40c --- /dev/null +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "questionTabBar_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "questionTabBar_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "questionTabBar_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..afdbd909e9c2a4bb4ada3be74dfe1045cd1affd5 GIT binary patch literal 1205 zcmV;m1WNmfP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET7A4x<(R7efARozdURTzKH+ZMVC ztSyv{Kx@D31w~g%fS@sHT!@JmPBWJ+j_AeqN9|9wjjT|BfzRWFCYK%Vj@ zBPTyV0ENoVniH_R(OJU0hu9{2vxT^{eN_O(xx$rDdv^!4*qcGpcK0w6hOmL|AP`qE zcS;sWHjHz3Yw*=glb&7sEgiUu^C8+$kT!Hg} z;9LB5WJawsRC}o2L?w|AuPpPg7vucf!~*{{n^9}joLZwePf$I&F~a@+H@Mr`exaOK zb&<9pi?Yp9Z-qK@o$60oCk?A~dT2v!HFGJ}D02yH!2Z+l2z++-0#?+_u-R()1eZ#! zB*5e8w2S$CZ|I%F;IK779*-E%bgh-A9)ZY-YPtSu00yu2LoS_B%XK(By6sIU3BdDy zLv@u?K>v>3`UON@ya!EyHcGMr$wU&PWeN)$JvcFZaP*hK$}UC1cearerlg|R+tq`~ z_Jbrz7Fi|-?9edCi%%xUCsWwdlgYf^4!0oaY8aEsJ+e)bC^Ej6M}HgmMNIw$xxw32 T6#!DV00000NkvXXu0mjfVtF17 literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/questionTabBar_selected.imageset/questionTabBar_selected@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..350fcab0dd00452727e4a5c607cdbfe9407b1e15 GIT binary patch literal 1931 zcmV;62Xy#}P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NI^+`lQRA>e5S!+xbR}?<8EUdV) zi1^^mS{9d@;sb#SsfyaB0n*A3(VE!)u&J8b#HKV&w3^n~n5M0!iMFX}Yajkl(OTo9 zRvRmAjnoPSMNpSjUIJQU6$C2F?o7`a_6{?%JFBpZ@Pm`=o^$U#_uTKy+{d|R07hu! z3HbE{IKO(kJ6kLk1HjlUj^h>xf{@B_U`07f5Fm_HuzVloR&2BBblgRr7fu7*E4AD0 z-Tsd6mjf2dtTc|(twIn>@fY4tF!xZu7@hjUZZE6oXJ1KuKn^4)XUxDSx&@zXu4Ks% z0c{<}H?z)W`|Cn~&GgFwvpHu}aB$~`ILI3O>E(k(#l=A8yli-C)^tdCA`vFWM1e7E zjHuFizXSehxe1Ne8=$JJ63WkPO<2D=)#p@Ag8;@lzo1yu42(&$|k*UHjWEuhfzs z$${kLSx*D#j-ioAW+*K?6W-WZ1PMuIRy82rV6TH6o3}zm>3MnoI{YG7w@2fi)Y7Ab)9rH+uuFJHG!gI`Rp0Kae)2PIO}7!<_KxKvGhgMW+io zi>M|LvhZ;cu;t5bU`?GmV4%J_UahKu^{>4JZU5e7YPWGZW&4^=nhwOpWrc=@I!n=# zIOhrcr+aon{NzMtd{B5(T?4$iY?a)JN?h1kS_@mJg#y8EVc-p+qu_&`TL&FHVW9^^ zW6_vynh_GxMOeI2khfae=du24{D}^(-SiG*FPP&^bx`UiL`{T<$OtI?^$fG0F@Aj9 z;X8MlZ?Ou-y}kiDq)&b1pXsdkaLeUV6|qZW2_?X zX|&IOb##y4Tcv!!{>Y8j>fzP=Wzso;VMm%e?C^L4cv!7ugXH8sJ7nMq1D!EBxeFN_ z(CNeoKq`}+WQxp^q00`0*?)>j(hYNn7Yp0B^%4Fp>%JcjQ)>wv_ z1E-S`1w&7i$zX)%fFkvxcmsBOc?BvqlQN}3Doe{)KTYnyjKYCBJA8Ge8tU%1YwA(M zb!^{WeGztDt${X&!>2B5M8H4~lMzmH%_8Pxs&8Y|&+DZ=Iy&Nt%N4vD+l{oCW6kl9l#;A94#Xn(yaY3(j*Em) zy&jx6m1wTh0yl+(i0#iziiYLMR#-9RNr*9uIWkRq)bLaBA^7oo%4CY<#4LEBw@bZd zz>k@U4cK)vb*EIvHzy=xqQ$}dyL_P<-hSnE=>D%a$BQ#!8$Nw;U8=|RI)z9H7mSo~ zHAQGIVzohk%T3qoVZ*8-2|U`Xa5~4lt7TWq0S@n0xL+8%C|+;)d!^m<=&Ufs#V z0li*G!97USqmK>w)8?xC1iXw##(+Qac{mUhq-((3C~d$}emmfZ(I5tlcMB#Sh&ELsw~ab+sb^_D4*NJOO{6!2g}#Y^Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IT5<4Ht8RCodHocVKH$8pE|?S;i2 zI2Oc7oFqs{JVZ&9rI?mw+Lo*+cG*f&wo?`VX8$4iL-Io^{w1zdITe==*@|OXjwMSn zB~lbgkOD~%0*U*^0@(BA^PR<#02d1o5*U#VhxNF-@4cDn{!VvKPfrib9+gK3JVM|R z0-qlO-v2?@^zlz#Z|@tCTy7;E4ri0mXfRnUdbPgqMSZ^*4FtSUv1p+HMf4OYe9Qa3 zs&@t$J z()a8bWFLXaW~9Ojg@P6G1uOEY-)Ixpx~A~k6$ulVp?X{a^W109f}x-V(6s>1d2`Y{ z|DxyH1>QZ2RGp{E!E4vf2*f=rdj?Qz>l5)a~d_HGufRSEG+v4n;&Cbl(_|023dhLcy zj!oFo!lDDPEL}2R{98b(Mo_yy`hMtF`F!+E)NcN>g7jGd^7{Kv9q_!&OJ>1uLfmtR zdvk$d%rfGLj5Rgyv-Yn2*4f)-?VbCr1%TQ*+pVc(pCua_ESXGLZEcN30zqet#893q zTP)b>YQ~nAmTh5v-exAJZDMrHCdVgi>=S`CY_~qSX|vOqBL*Q-6F~(-Qd^9=_a|=t zB9rl69~pV?I?b)?u3Fz+`P2aQ_rFqOHh%=E`Fr~R9)sAM&pUNO5`q?k@iu@teC%;M z_Vfum`s6WdZEv$EOc?5fUZGN@?)87^TbU1MV{UWhBoPDSp>~-<-o}xl3-5nuADuaC zS3VlFF@ReE$O6w~qv$_JlLF@7d_VjjzF&W7Xy{im;=3-vUDu$($&)9;`F!>Z5dI?! z<=??vA8HgV`z#a=S$a8bD``N=(Gvay?WcUt>+`J8 z7z}2ndV5>P$HvBX?GEf3Ac3>65Mp+!a*cXA2<$n$B9UwN#ei;y6aYc1Df~UGtKj5_lZSHGIIVnx;YqGjjy;CvS zr!>-p_47i(U;}7%F~h~z)`H`GeQguF1!-3R37m8~@CC^JAsv4Y2}%KulZI9#|5XeTYKRfU$t(eNF&Q+?f?;^ds!q3y27YzTU(3uAx$l)unhdt;*zZ(QF1A872*tJ zKdwhjJ|CFu>1p4UB<%(uFPZE*#uDL2fb$(DsFY?W%~D;x-S*$YieA@Q}lmMvz7ja!!Wj2-cRAxLmD+1{qN{r<>NkinPo)~Hy{FUisMs_hEiEjpt6QL+ zSK3+6O(had*A^BgcbwUF1nB6|qY1P4SCQiHb3KDf1?An!(R=aRuh`eW{jzoUbUQJZ z2toBNNeV+~ESa?WeU0W9eCK2?&MyF-W>621nC61PnfCU>H>akCi3(INI|7tS z_4Lv04-m~4aRBRNcN&`-?YYxmvX@@{8`P?QU2;U+=LydpCIylfE%o(vR*OHj1US>< zleW6D3XwiuMz8@4nH2LErl)Ue;ajzA3s5T6UsqdO`wbBP2VD8S9Fn8;)00f)QmZ3R z9J3nMR+#Gh7jLLadi4k8VG1EJNkEDvVm384$vQe|HYpbg_tE$?z z0JXOEJ;~zp2cZ5elEZ2sVEdWApMUvl_T?8(TSFr5404&E>Lhd{8GHV&HzOmk^)|UaO zyQj-d<@pCht+rxN1IL2K!mQH_FI-OKt&vf;zQae0F#R*L6|cnOJ(m_2M`c1QN-4fj zaoYm1SfGyy;VC3%KceUgf%udIfMM*Lvx2u(W+%hBTnQ|cn~ixAO~;a5nfM5qxFq^-x(mn7-1^3@$zF_ z&47bM2AorP58ANg$x`?fIH;!QkK z>ae$m#QWXkR{#W}ylenubqW_mYipf)DV#xo#fj?OjXW&B1qEvif_KEl`+6L2;t}^+ zTT$Y9XMhTYYz&*+iQMs7bSSqghTOUj&GQ~8k9oHPRxNv63a1Wsk`J39{%k#aH62h-1;{Uj#tns}^3wlQt|%ySk3GBtZ~(-&`sH0ux0rZ@b-E zphmO{3Q&IuMG_=lw6m)%qOwkiX9VIl-(_AaxW+f&o|>U(5r)pX?cvf5=eE1A58;1W zatILF6?QyIT*70ifKbq{#AE&G?GMkx@NBd+U?njuH*@>N|0iE65X5L~b1^K%tKFc(W2q?f#B&yVBYzbD5kMlk<}2b~^sqnLXIdoK zw45f;#LaSZ8yk6;zKe$(hL-r2%MvMbB%#2%IKkM+PX$0&@>Qn1TU5-*{$$s(E~7#j z7E;%W3L9H{z`vIVcXdsfBihS%8;hb^xGfR>aN(nkY*g@zbC_oFb{)w}%Q&yDuG;AJ z8^m+R*dZv~ncgO7sr(ZX+LbYq?O)B!O>5KiKU9~Kvu`PwrWrJ zbm@7}jX4`M)XlO(x^7yxtjFuy7RM}YDA#C=ge=*ib+2ZHilf0`M4y{V#Zn`m4=#m5 zJ_(XG?Pf7@a+C}(d2`&RNmhz>)#4k8{GF%%bx*@)vl;t@)D-3Rq-vtJKbEk>x*wuQ zc{y||@h^c>@>Io;cJ-z+t2VN{Y^zKdP1Ns7BrQocnkcB4c6h&9ab6(&Xs}1GkC4T- z>bz-sRbuEB>Mh+}w*sKy;Wx4e4xAVZ25U%Xvt6GKv8w=cac&mrTe5kWk(ym! zTBO~K)dWKJL}QZ$>8vb)ThXF>qDPiyjrwDNGxiBvKa0z5ty$8B;tbK(tD#WM&MKw` z*Vbm{eZTQtfO&?jh{svwM#fRG!E+bvuh??#>1cNy3ZShNtpt!+8kPEZao#S^lZc5e z6R3-THp?_SiFgko70m?Xl0+(NWGso*6p+?s-dO;oiM3Um0H_t(Q4up~o{8CK_K~Pz zDF+StMsib*_-YU4Gm=u z9y~QfAo~hLt${*BIe=p$H|-XikO$e1kM6L#7kDDf%~*UXGJ5Q0Iv_}mvqkLEA}Vtk zko4Z&rCc9WTpfWc2Tw8N2=*(4kEWvcb}DLLZ_iE7+NBRZv~hA8wFsxEIz0MkR#zA1 z)_?2%?NaLH_Rl+Cy1F8>(4pCEgv(chi=>fULCr=O0eOuTOW*bC>Qy!>hJ86$S8u(E zdXhIwCR@+MqyWpqu=8s1uQJ%2%=%}RPd(Gjr+3SBz{*M7k;as@V~bRFvOjJTX9$*& z$l;-@NYEvhTqS8_LqZaBu2>AcH#&Mj3Fzu-Q>n(I4G#|&Q>p!I0r~qGte$`uh{^NJ zG3w2&E!Kbdpc~08_iO1wJ%v!2x^Ruv5tW2bRHeX`bD+3Ug-C@S!i?fKRYd%mp$(Cetjt_1H?aOG;2{*&(|kT0CSU~l~5zwE-94^3-J z1@xH@dtKfY>)+I;@ znCktOolJ~6gL?k`v-Z26ziyW=46?k)TZFz*+{-}t8!xm-e|PDVHicnvVp#AJ}-N+L~aM>Ez=86~niGOl?fbm+>E{r2a-v5V(Ea^M7I zoIM*SOZX4Lp!e47>^qCRTD9y15K_OKE);4nGQigW=l~8?V1{+fjiF(Di6v*KtJ$G) zuNrA3b?QAa*~sRdE=z1D1M9WdZPC3Zg-T`>Sk}N?=WNFxU;n+GdFwrnEX*P~5zSt> zQ~tX=ek~Y`5w+O9>=#h;HJNjE4aD3t*gTxCkddwslgFn%}{RDwV0G~-HGXqfNj;z-S?zcGN?I>{xz0F z0_VT~^EJ2T5^`j$Xg2$Vq4^0%6MoG}Mfp8DmK_1YF0-LlIKgOlaae>PW5_y4u|4+G zacf`$ZYTBHiGtk%ad&$HMk=Lt7V*%B20wOc^}ApE#)0Dw;gNs=I8(g!OJwq=gM(*p z+}%#K-#Y+wI$A8I`vIq$4lo*?)uLJgsP|y6#aV1-kcRC@2>{#k1#ap75|Fr=(WK zX~g2seLwim$z=WvWv8Xvrrx##i2jQmgd&eqqfu!h3ASu|@t`}%boDWMQm?%RNKA|M zjS^Be>asEFPhr1lqJlb1H#~IR-ueAoID+qUZtP~s&mpZv3sD4%kd6Oq?9RUo4b}eH z?2TPpglz%B%WNkUIRIG+9af8zZ+wtbHC<$A$+;8Z6??VZ+lwL~%9p|%iihh!-5OEN z31+AZEIL0rbMCGKb;Qi^bGRfW#MOOwpsuE7;iB2Qy9P&mR0Zhh(eH+`*&FSQW}8m1 zYjK$%h3z2OqCFiQ#FtA`aLIjBQ+rd&(|Y+x=F-xV=@`Mx#1uy|$4f^tM@Ko5IZ|;X zQwdQr#z_5!BbjeqhcaRPsY+FVR#rwD3B9(^v@+M6&!a;uI#~NY?zJ}F%3kuP>bXiK zMIp5u$hfVUv^%Xck1FXHO^WnOsZ!B z2UN7#x8Yd0w|*>qg=67=+R+KDGDe$jR|5!14Y6_PHqyX{@xdr7OrW5X&TPnt-jCwi zr9W}6Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET6N=ZaPR7efQR8341K@@)b(}f~! zG5pgMgreo3fVCn~({SNnf}SCIGhR&OB8kxi{5hzJU_wGnL^(+UH$y`3z=ea2sAwd? z2tv6DZ9SDjx7%(z&MVB?E=z%f@g#M6@!kKxD^#Xi-z2~Z;D7Wa^DM~Ks3ykK3Kn#F8w!Q<$~RCVGx6 z0R}Sis+xq2jYxV4{zohIQUX~Uk(}!4h|EnMGiyqog`mddwRg-I!8uE zMoBW6+Ls?Oh;_MIset=Azys~CAg7>HBh}T7K3R^G`Fx+<^mT-q8V3{?AJxIOr_0N$ z^jwBuc=!$dHHp_&Yw4X}a0J^(GsAYMufLR+O8vf>NW^bfRFv6UTRnhxg2w5>Kp+Ho zptG}cv};1YXbTVUeCdmom3NB9yb~A-Fi=B7%L!RluBmFOo#){=?eCpiMZ&2REQ=yP zZ8qnPE-rrh$!hdIrvL-HTo)|KWUP#m7GREwMFk;0w6x^gew-NafA~Lu@CF59L7Kk+ O0000Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHfJsC_RA>e5SzSmRR}?<8x@)i| zL{~}t!A9$DAAD%(uGOf-T9Q2UDTSD%p*|=nB~bfRYLmvaVDKk25L#Po5h=9PhyKxk zlxT=mYKq3S5o)2kMkLX+pc_kc(`I#ddd}*Zo$SoIqq9F0yfB<|?>+aN@4Iv7%$+*` z+huzObj^UEWpr_IvFXvH)FXl*903sbBi*CO#g)tjluAAR&>vA5&xe47WQr|*XP`jb#yT?za4<%7u--4*2ZdSPbf4h#(Z z4Bg#d!Q$fI92%u~(d8Ozlr>1IDuJRR`%zr)U$fQW!`0B*+5|gyrg2kD<8e8>wMkQ4pX9*6U5Zjs1CKbLh|u(9zKjNN9aXd;|i9hK6^buMbzx zTA4GM9u|f^*aq%piP@$G^#FKUHtp^2#T`6hp$ThiI}aHd=?pCwu^rQ4m0b6gJY6Du;${Kt;t%fs6F57NgN9AF9aRY6Rp1wyd8ya{=b( z7XlaQu_`emK;XH^b#9B6j2VGw0gU8ln?R%)igo}0{thJTnITG#oNXfc!S4!%Nmf=S zZW7PIfdl1=KCKP9?toVC;lNOK(wky+5eNrtbM4~h%tNeo5ol?77qYUqc2dG%;dIqYhDqwi{M-{gKp=;jh996Z`+o*O2q?3S^l@-1Ib&n6hAYo(2Y6OJjQX}vuch1hMwi1cQW)0jUxAgFBs0`ZP{#ak-}D03>YOs33r! zZ4T}n9UW(N(~@3NT=ZnBkr4?F;CKEQ`(&vg;P)E_xN~rD7<@h-S2ra&#p+3w6q_(` z5d^=4joZ|u!D1=7iXkA8W|72$7+`&V>qlDV!x(#%KTwbo+*GH4prAwbcPtUh9m%?kfj|#hy3QK@IxZU@D zGn@11Fez{%=5S2F>gp<#mD!_yUW$1RE?@41&d$#%G?<2gioDenSG}B|Cd}pU-D} z2GysjJ~nm>rl)71va&2{{|IQ!H#WYHGymAnm@9Z1T{k~Jzu}80A^~!+V@LKCqfvMc zA8ZSepx1kEZ$ISc=RrY1J~eH*P_{XJ`Yp^j6EYuSug4>vn4X^aSJtSiYCiP0*=)uK z50XB@za_8BJ=yKg!l_fW_+7gnl9RQ4UeGce8u|sgy1oe9QMo^S=04rE%h%v=I5h3$ zH51?Px#07*qo IM6N<$g0KR`eEPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS~;z>k7RCodHT={bp#})3GJ#?;w zE_5J)E+jAr0m5Kn$56)Dj_o*3DpXvRs-!AE_ffXUgOl4FjzEs4*|({xmZ|GnimKY}x~{A1ZFeK}6h#XL0?M)w%Cf4e3yR{O z@%!ylHe2qr+kFA~LXWro^#G*S)HLMkx~KvU4It)_qUiPLxB^eUqNqYyPpk1#zNS3r zLDB^VX9+KppsNpgcahhss(Op21$*4?A1CllW64-kysX$NE00z|MoyrE(;%i6MC5=7 z0+x=vc-xDW&Unjd7$h&qnNk!5VCfI>`!%Gisk{4!E;JU5wZWJfDl9yZk(HIwpzF$; z==?QwdI+7Q1Oh?f_Xk8U7!aDK$tTv%lTi+;CHUBEcHwZ?h23srH;^i&4TE?Y(tdGv zcBy4_^v*&o{l^4QLBYw)ZQJILV-)@dsX2v?@&JrVKvGjvL{^qdq^GBYAcrIfv2zH`9l=NH8IxJNvE z*e#ly+eBAauUK4Mgk&qK&1NeAhNr=cKReqCL3`u+=;)=0k`xi3GiQYD#~&wafc)<@ zO@+)m~4`R@&L|fY( z(b{@P{v8PTL7y#8QEUK7^SWG z?RF_O@4fey_~3&-h~vkPh~nZxDNUQDT4uUQLt0v@l;%BqswGHN{fUVwF+DvCTNwmM zN+ur6xQf@~DeUohMrO=ynBOe{+P80C=F*b$C5YsQsIUhOD>Ql)6+6W{@0=FzzyCJg zcS*pW2Vl%h@trhrFmrQrFo4@(n>482gtSYvQ}~{R2`3w>*HK)YGdMmzPCx0XWC@VV zwX+s|yoQE;3+YK+US1a4w-<=F-##TMJ(ZQ^o8s?0#X$@i+1V}$)Z(H~JbE-BB?*HK z))W^EQLhkb!yeDTSh%JvJziM-!)V|D!7*m5G_hyTZgJ|=2~k~L8LqA8I8Oo172@^R zPl&yHYoLN@(j5VBX?W`3qQKz|pDY1_L4E;Ms-RjnsF~QYqgXUF9E340mEs$|x#u?* zgDrOM+<_VQ5O^rYEDUcEypc!vbmTQ`vIGbXR^TatVOD`M8ZE(WwFf>=X4r;)37PcQ z$OCyHPv8wKDkY%3!is)NfY3lOD&^4X17XYxdD1A;_xYu!)YMc_US1~h^K&In25(#{ zi6SeWBKScHMTIMKDUKN#86qcVn^ij-&NoKXSR%opOPU&IXJ-rYLKS15-bd!fD%Vkq?SCM3DMa2jRa?ScvKc8P_!3Z=Or4TNVJ6ew&?&F>eVd>4wnc_e0RIM zrRs$v`dQ{}IzTj(e!pL?kwR+B*@by4M)X!?jX zHvpL@1iqUAi^@e33p^J9C6T`kH@)cqF@79QTA0Ugo1HeDf|QgL1lZM82ARg0dHlB7 zDXFvA!h%-@sTLL%5MIzBDXZC~gm5~apZBf`_H!qKc|ZO1vtS&G;TChEvxkVFTrzNt zm`qpPHShMqclt7#tjuF`AI7FU5_ zoensX6^Kv0DmM+dQcp%o3P6+=f^z=+MRD!g4e9vNw;=!_5JJpQmFP7yJQ@PRZdav~ z$bdUS5}~5(9nq75#`LpM7xujnJH>&sv{a{2I9Gi zz(9PcZlXa-3P2>1v&u^^9g#E5{QSIWntw9alPR~mM|}M8r`Q3#E5Tr0ZWY(oR*Mfm z{EOU;pwWMlj0h*|GN6{9pC`AwpL|d3TLgfVRf=usx|z`Egm9mpPozXc>~dwuLkCnJ zCT{F8Z~y+i5}-)+NPoaw&~Vn`1IS$8>V0WxNvhOZ)uWp6 zTjG=cl;gRUS97110HKiFiZ$$pfDH-Cku_IN#5;ixNshTa=B@Rh&EMDiZXA!HPiBNw zR@w=>?aXhM0D-;*5V;&0S)Q|D^zWCR$OCy{B5&l8yjt-U0U(_x9=sudXgGN~A{nD< zNRU~5jpc+D(d*48?c{;HFs<l?e+{G1ztV=pnfz;i?>?DbFEs z>p78uFiH;(PjOj8Bb}C(PJnzkSKjS(rgX&(kj*yd2?SF6(8w?jJZ1qXl{3KIyAQBN zs=~7y9auFRdp<`pD=SML2Cc8(Co3}2$R}}07Xt%B;@-Unus^e)n{jZ40MubjY<&*L z3{T*PO_o#?6cqSCWG~dK6{9-K2p*$^EiHG%{reqo8vS7#TyG}VR$S5ZNh~;Yasvq8 zcHp#YyX1kqkSFp+9EmFRML*9xo4(G43s>+oO7EG{1aNey zS0~8-XI7Th)ZX46b*7055IGwj9@g^nOR%UD8R(!K9%%ORasU8v;pdgXEqcPC^F7ZT zjWr!|DRJ%Eci48iAZIV`$vK_UFb_a_{)^z>`TO@&)bk*&yWnuyNdPa3%+1Zg0IKqct#SA=YTpSjFg!dW zu3r6CeDTF4IdjogIvh@bqrlHmn?Ub>a5?8zYwL}er{9TW62 ztq_mR=UbLrJ0m0GGU~_+BwT1>)DjLtxCZG6K6=y-gWM?2o%?EKO6PvRois4$*9^z} z6Q6JKQcq8-W$Y(h+i?NJ24-f)e0h1rLr^uuJ(L2dTM;FRdsvf`lX53@Y|JB%(D7V# zvJaknJd@(vZ*NLq8XKFi9qq;p>syf=8`fIl7M_1VwZ81`Zo~c6_)^>evH6LKVQ+SJ z?y#ylC`q_6qZC5Vo!p+`?9taZAVUfaymR(oq5+3m%J+@_!_7nv0=JB~F?sIX1ql)t zq8Kz8O9D*{T;0Ur{TtWT&%50}jIXEP4J=n!oS-6*_aEpkm zW!}@Osi_nP57x;&vWkjwxCOKcHVIa&fH73chrm#s8Fu;p`(|l`J3Dzoc1+Hu0E2cA zQ@Ki83FlV-1Y>fwv$GkCQNUSUUI!s{AWR9J>!HCe zDJhX#(Y$R_Qc@&u4ACv1gUP#GJnpg28V72hyGZ0*dMGq~H@y9WTh1;XA1NHqYd z2%m5>n%g(V(HE*&QBk4X3@k0(feU*1a1CX`oQ-f%7v*A32?Hq9Bc-Xmy?ZybY##<0w-!Y`7~hW( z--$8`f#S&x+7m;%3@`x8V}lN9U{MJg)ra62&YqmM*%g-z_^&6ld+4Jb#ap3W_v`B` zA0|R-*g+^I9H3CckSSYP*-&A6`qGOqCoh7L{a~aBzlcr>T&C3-k>?318NGT^Z`B(O zD@6vuJ7peqXHa(*za#j)2kdTpy(zc*`%7@iW8>KAyN20Kcqy_(ZpqcJqN$guMjy>nrK(1@Qu^+=!(R2Kr$b~8%Dg`=5ace$&DJ} zaG;p;LKK zuWqnR(0$0kR=7474EpEt@@xx;0@47-w4O=^LtAZbA+UwO76Q)#f&T*&cW@qeVp4zr O0000Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR917@z|H1ONa40RR917ytkO0OB=utpET6*-1n}R7efQR84GDRTMt={SB>| z)~R$tTiP+S3M|@M3W(MPG10_C7se%QTw-EKtc1iwm#_d5HH`!UX^2GG5E3-eXkyq* z1nhuRiPSPR4S~)K1}sBn-n?JV_a684b$G2S}CRGU|{Pmt6{%So|M;LkZ<>DD_n*)b`=Ci{$Ql3SpbrdS$qp20I9B8B?p$wr*PeGt zPo=nL^u1isH?-N0cjWBm+@4%t8dwr{iNJOGx_Y`P+m$6-uEw5%w`*qcpFm+Z3vxQw zWocbc7deb2*CPTr_{1cn5-IF89h(kZD+CG~zGi_37;(|!FG)5iQHAGu^w17_gAJe0 zYd-&0lT`^&i|smOdAt{V(3Qv4!PW%#pa{}cbybQL33RURkH!0RX!7e7U>?9XNJpa9y^8wCh+sCL?*GW~B;E7n?-e4_`0Y{8L)GV_>4a+9YFoG1MJ*69@ zB9Or(NE@H|H2YolctK>if?UhA5Le^BK%!%+samm8s?gu%N&qMW001D2D8(dD*l}>g zq6p+xN@dbir3fD+>OeEJeEH5osO{=>n?ts|7>uO$ShZF=e|{d%!LcT1Jqnr<9Xl+G`1 z-u$i+AwM<}31rZwP1~QZ*BiTC$9s)W=W~2m+ru?~k?-EDswqFVw4_eoxN-SUnbZ7S zl|Tk>+&GqYT{Fv|t?)5fO;y)aW@hqL8S}qA9|7U4zMs_nd#nHe002ovPDHLkV1jB^ B1{(kX literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_selected.imageset/sosCenterTabar_selected@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/Tabbar/sosCenterTabBar_selected.imageset/sosCenterTabar_selected@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f40234a7dc5f803a3fdc3d84dea0dff4109b2b02 GIT binary patch literal 1592 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 literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon@2x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f3bb89cb31356eb1b250c3693adc81c26752ca1c GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~STEL88gA~qMxha%^fl1NR#WBP} zaOxCme-OKf+ueOxymk(MQaY9a!+ZJVu;rI8&S2D$+#0TEf690xhoh#p7stb&YfK6!Zj4&{E9dsL z)X2UCUfii!I>KD*ImDlSsoGniHrep#ZQcu3JY2tjd^4HrmoMtd$-~wh>EAM`-jRvT z_56$JZACJRFP>nW!KZ3|+KVOQqVh*am$V~?%irWqIey;E=l4$DLx<-od}HxCC9#=3 zt4?C0*Up%{RECy2j{;%96ASYWZoV0J@C#}chs@$+V1bNT;H^@MfvB>fYi z4`*+$+rR#;)J6uww9S#Op;x(X2{dZ4|9NI}X#G5|sNYT;Nk)JE9+~*3`M3St(+=As S$_^g}B^pmxKbLh*2~7aI5fvr? literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon@3x.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/close_icon.imageset/close_icon@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c11094e3a2973b75fb731419ce69c9a77fad70f0 GIT binary patch literal 1163 zcmV;61a$j}P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR918=wOK1ONa40RR918vp@V4|w3DzLS+WueSM&F41C zU^T!juHPiy=+4Z!v>Ff!=TYUS#!oxHNPmBS5;Z~8Wi*E*$Y1;(7D`)|ncLWxJ`;diSe4&Ro{5~B0rp&s-(I3@T_v|u>P?Q~0cHB|k*u?B4+QWXMcNC2 zRD^Hd3-(+{mP#R)^OcT9qfP2JZ68e5aSF(~HZw=Ej??=Jqx@`MDij$=ft zMVmjKzi9Ss)c*`9hyl86tRv1d;!DL86@sFs9c2^rIbRFlE7a*^eqTEI+9DyBtmF3+=4jvl3_t_3-wVqgpCjB zt1N<#N+teX&0w8EAY6ObBM8Cnf3qw z_0a9s9Ue;y{QTvu{I^w{lu&s1e6A5i(md!cRS7tR}ND?gu)lP&6d z?!d=*u+hb1yZVRqE@k|`%C-OAiJR=d(z@xKdRdo4W2dhBrVUC;1qs(?D2c>fKjX|I zl~&`a(wUUR@I&Ft4@W_99@e~(g51KY#e7WiM jsrLJ83ON6)a@lXcPw!uj&3YkVm@{~~`njxgN@xNAykXKD literal 0 HcmV?d00001 diff --git a/XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.h b/XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.h new file mode 100755 index 0000000..315892b --- /dev/null +++ b/XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.h @@ -0,0 +1,13 @@ +// +// JXIDNumTextField.h +// Snwdai +// +// Created by 张明辉 on 16/5/9. +// Copyright © 2016年 张明辉. All rights reserved. +// + +#import + +@interface JXIDNumTextField : UITextField +@property (nonatomic) int largeIndex; +@end diff --git a/XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.m b/XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.m new file mode 100755 index 0000000..303eb74 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Utils/JXIDNumTextField.m @@ -0,0 +1,53 @@ +// +// JXIDNumTextField.m +// Snwdai +// +// Created by 张明辉 on 16/5/9. +// Copyright © 2016年 张明辉. All rights reserved. +// + +#import "JXIDNumTextField.h" + +@implementation JXIDNumTextField + +- (instancetype)initWithFrame:(CGRect)frame +{ + if (self = [super initWithFrame:frame]) { + self.delegate = self; + self.keyboardType = UIKeyboardTypeASCIICapable; + self.largeIndex = 18; + } + return self; +} + +-(instancetype)initWithCoder:(NSCoder *)aDecoder +{ + if (self = [super initWithCoder:aDecoder]) { + self.delegate = self; + self.keyboardType = UIKeyboardTypeASCIICapable; + self.largeIndex = 18; + } + return self; +} + +- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string { + // 计算最终字符串长度 + NSString *newText = [textField.text stringByReplacingCharactersInRange:range withString:string]; + if (newText.length > 18) return NO; // 限制最大长度 + + // 允许的字符集：数字和 X/x + NSCharacterSet *allowedSet = [NSCharacterSet characterSetWithCharactersInString:@"0123456789Xx"]; + if ([string rangeOfCharacterFromSet:[allowedSet invertedSet]].location != NSNotFound) { + return NO; + } + + // 只允许最后一位输入 X/x + if (([string.lowercaseString isEqualToString:@"x"] || [string isEqualToString:@"X"]) && newText.length != 18) { + return NO; + } + + return YES; +} + + +@end diff --git a/XinjiangProject/XinjiangProject/Utils/PaddingLabel.h b/XinjiangProject/XinjiangProject/Utils/PaddingLabel.h new file mode 100644 index 0000000..b58d835 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Utils/PaddingLabel.h @@ -0,0 +1,18 @@ +// +// PaddingLabel.h +// XinjiangProject +// +// Created by Apple on 2025/7/9. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PaddingLabel : UILabel + +@property (nonatomic, assign) UIEdgeInsets textInsets; + +@end + +NS_ASSUME_NONNULL_END diff --git a/XinjiangProject/XinjiangProject/Utils/PaddingLabel.m b/XinjiangProject/XinjiangProject/Utils/PaddingLabel.m new file mode 100644 index 0000000..4d8c133 --- /dev/null +++ b/XinjiangProject/XinjiangProject/Utils/PaddingLabel.m @@ -0,0 +1,30 @@ +// +// PaddingLabel.m +// XinjiangProject +// +// Created by Apple on 2025/7/9. +// + +#import "PaddingLabel.h" + +@implementation PaddingLabel + +- (instancetype)initWithFrame:(CGRect)frame { + if (self = [super initWithFrame:frame]) { + self.textInsets = UIEdgeInsetsMake(0, 6, 0, 6); // 左右 padding + } + return self; +} + +- (void)drawTextInRect:(CGRect)rect { + [super drawTextInRect:UIEdgeInsetsInsetRect(rect, self.textInsets)]; +} + +- (CGSize)intrinsicContentSize { + CGSize size = [super intrinsicContentSize]; + size.width += self.textInsets.left + self.textInsets.right; + size.height += self.textInsets.top + self.textInsets.bottom; + return size; +} + +@end