Compare commits

6 Commits
Author SHA1 Message Date
jiayangyangandClaude Opus 4.7 7203085d70 fix(emergency): 群成员面板cell整行拨打电话,补充电话图标资源
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-08-04 20:01:16 +08:00
jiayangyangandClaude Opus 4.7 f597c63ae0 chore: Pod更新、AppIcon替换、文件清理及配置调整
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-08-04 16:32:13 +08:00
jiayangyangandClaude Opus 4.7 2bcac71a19 feat(emergency): 专家端应急求助入口对齐员工端
- 首页新增员工应急求助入口,接口改用 myParticipatedOrders,1条直接进群聊,多条弹窗选择
- ChatViewController 加急救员流程:isFromFirstAid、群成员面板、工单弹窗
- 急救员入口隐藏语音通话/档案/结束咨询,标题写死"应急求助"
- XJDNetAPI 加 getMyParticipatedOrders/getActualGroupMemberList/getSearchEmployee/getSearchExpert/postAddGroupUser
- 拷贝 XJSelectContactViewController、XJParticipatedOrderModel、checkbox/order 等图标资源
- IM断线静默重登,异地登录弹提示跳登录页
- 首页数量标签默认隐藏,非零才显示

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-08-04 16:30:32 +08:00
History 2cf2ddcb19 删除多余文件 2025-07-14 10:05:15 +08:00
History 762d407ddd 专家端修改 2025-07-14 10:04:46 +08:00
History e84207f835 修改组织关系 2025-07-04 13:59:05 +08:00
364 changed files with 4466 additions and 2231 deletions
@@ -11,7 +11,7 @@
18F6BBB52E0AA4FC00F8C4A2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18F6BBB42E0AA4FC00F8C4A2 /* Security.framework */; }; 18F6BBB52E0AA4FC00F8C4A2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18F6BBB42E0AA4FC00F8C4A2 /* Security.framework */; };
18F6BBB92E0AA53D00F8C4A2 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18F6BBB82E0AA53D00F8C4A2 /* CoreTelephony.framework */; }; 18F6BBB92E0AA53D00F8C4A2 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18F6BBB82E0AA53D00F8C4A2 /* CoreTelephony.framework */; };
18F6BBBB2E0AA57F00F8C4A2 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18F6BBBA2E0AA57F00F8C4A2 /* GLKit.framework */; }; 18F6BBBB2E0AA57F00F8C4A2 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18F6BBBA2E0AA57F00F8C4A2 /* GLKit.framework */; };
DC560BA5B22ACA1774C7E09B /* libPods-DoctorXinjiang.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CAFC690E14C25C2FF40737B /* libPods-DoctorXinjiang.a */; }; 47D1EF43FE64AEB378B7D80B /* libPods-DoctorXinjiang.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AC2C8DFCE72D4FDEFFA0D22 /* libPods-DoctorXinjiang.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
@@ -32,6 +32,7 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
0C51BB554CF919A18FB142E9 /* Pods-DoctorXinjiang.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DoctorXinjiang.debug.xcconfig"; path = "Target Support Files/Pods-DoctorXinjiang/Pods-DoctorXinjiang.debug.xcconfig"; sourceTree = "<group>"; };
1883A96F2E0A4AD10055089B /* DoctorXinjiang.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DoctorXinjiang.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1883A96F2E0A4AD10055089B /* DoctorXinjiang.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DoctorXinjiang.app; sourceTree = BUILT_PRODUCTS_DIR; };
1883A98A2E0A4AD40055089B /* DoctorXinjiangTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DoctorXinjiangTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1883A98A2E0A4AD40055089B /* DoctorXinjiangTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DoctorXinjiangTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
1883A9942E0A4AD40055089B /* DoctorXinjiangUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DoctorXinjiangUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1883A9942E0A4AD40055089B /* DoctorXinjiangUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DoctorXinjiangUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -41,9 +42,8 @@
18F6BBB72E0AA51500F8C4A2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 18F6BBB72E0AA51500F8C4A2 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
18F6BBB82E0AA53D00F8C4A2 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; 18F6BBB82E0AA53D00F8C4A2 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
18F6BBBA2E0AA57F00F8C4A2 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; }; 18F6BBBA2E0AA57F00F8C4A2 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
7CAFC690E14C25C2FF40737B /* libPods-DoctorXinjiang.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DoctorXinjiang.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2AC2C8DFCE72D4FDEFFA0D22 /* libPods-DoctorXinjiang.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DoctorXinjiang.a"; sourceTree = BUILT_PRODUCTS_DIR; };
89026E00E1DDA04F74446DC0 /* Pods-DoctorXinjiang.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DoctorXinjiang.release.xcconfig"; path = "Target Support Files/Pods-DoctorXinjiang/Pods-DoctorXinjiang.release.xcconfig"; sourceTree = "<group>"; }; AB6256E214245FBA66E71FC4 /* Pods-DoctorXinjiang.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DoctorXinjiang.release.xcconfig"; path = "Target Support Files/Pods-DoctorXinjiang/Pods-DoctorXinjiang.release.xcconfig"; sourceTree = "<group>"; };
97D33B21A85118EF4503CDD0 /* Pods-DoctorXinjiang.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DoctorXinjiang.debug.xcconfig"; path = "Target Support Files/Pods-DoctorXinjiang/Pods-DoctorXinjiang.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -85,7 +85,7 @@
18F6BBB52E0AA4FC00F8C4A2 /* Security.framework in Frameworks */, 18F6BBB52E0AA4FC00F8C4A2 /* Security.framework in Frameworks */,
18F6BBBB2E0AA57F00F8C4A2 /* GLKit.framework in Frameworks */, 18F6BBBB2E0AA57F00F8C4A2 /* GLKit.framework in Frameworks */,
18F6BBB92E0AA53D00F8C4A2 /* CoreTelephony.framework in Frameworks */, 18F6BBB92E0AA53D00F8C4A2 /* CoreTelephony.framework in Frameworks */,
DC560BA5B22ACA1774C7E09B /* libPods-DoctorXinjiang.a in Frameworks */, 47D1EF43FE64AEB378B7D80B /* libPods-DoctorXinjiang.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -137,7 +137,7 @@
18F6BBB72E0AA51500F8C4A2 /* libz.tbd */, 18F6BBB72E0AA51500F8C4A2 /* libz.tbd */,
18F6BBB62E0AA50A00F8C4A2 /* libc++.tbd */, 18F6BBB62E0AA50A00F8C4A2 /* libc++.tbd */,
18F6BBB42E0AA4FC00F8C4A2 /* Security.framework */, 18F6BBB42E0AA4FC00F8C4A2 /* Security.framework */,
7CAFC690E14C25C2FF40737B /* libPods-DoctorXinjiang.a */, 2AC2C8DFCE72D4FDEFFA0D22 /* libPods-DoctorXinjiang.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -145,8 +145,8 @@
4222692EAAF776967D8AE608 /* Pods */ = { 4222692EAAF776967D8AE608 /* Pods */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
97D33B21A85118EF4503CDD0 /* Pods-DoctorXinjiang.debug.xcconfig */, 0C51BB554CF919A18FB142E9 /* Pods-DoctorXinjiang.debug.xcconfig */,
89026E00E1DDA04F74446DC0 /* Pods-DoctorXinjiang.release.xcconfig */, AB6256E214245FBA66E71FC4 /* Pods-DoctorXinjiang.release.xcconfig */,
); );
path = Pods; path = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -158,12 +158,12 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 1883A99D2E0A4AD40055089B /* Build configuration list for PBXNativeTarget "DoctorXinjiang" */; buildConfigurationList = 1883A99D2E0A4AD40055089B /* Build configuration list for PBXNativeTarget "DoctorXinjiang" */;
buildPhases = ( buildPhases = (
ACAA23BB1AA67269CD6F784B /* [CP] Check Pods Manifest.lock */, 5D513971A5AEAF177B467A28 /* [CP] Check Pods Manifest.lock */,
1883A96B2E0A4AD10055089B /* Sources */, 1883A96B2E0A4AD10055089B /* Sources */,
1883A96C2E0A4AD10055089B /* Frameworks */, 1883A96C2E0A4AD10055089B /* Frameworks */,
1883A96D2E0A4AD10055089B /* Resources */, 1883A96D2E0A4AD10055089B /* Resources */,
CB8DD4E9BE8895D6A39A5E05 /* [CP] Embed Pods Frameworks */, D66A00D755FEEBA744E89395 /* [CP] Embed Pods Frameworks */,
8D069A0A4EBD8020808E6454 /* [CP] Copy Pods Resources */, A2C3C662F5522670CF770A4A /* [CP] Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
@@ -288,26 +288,7 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
8D069A0A4EBD8020808E6454 /* [CP] Copy Pods Resources */ = { 5D513971A5AEAF177B467A28 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DoctorXinjiang/Pods-DoctorXinjiang-resources.sh\"\n";
showEnvVarsInLog = 0;
};
ACAA23BB1AA67269CD6F784B /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@@ -329,7 +310,26 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
CB8DD4E9BE8895D6A39A5E05 /* [CP] Embed Pods Frameworks */ = { A2C3C662F5522670CF770A4A /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DoctorXinjiang/Pods-DoctorXinjiang-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D66A00D755FEEBA744E89395 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
@@ -390,16 +390,15 @@
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
1883A99E2E0A4AD40055089B /* Debug */ = { 1883A99E2E0A4AD40055089B /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 97D33B21A85118EF4503CDD0 /* Pods-DoctorXinjiang.debug.xcconfig */; baseConfigurationReference = 0C51BB554CF919A18FB142E9 /* Pods-DoctorXinjiang.debug.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = A7CC5LW224; DEVELOPMENT_TEAM = A7CC5LW224;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
EXCLUDED_ARCHS = ""; EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64 = "arm64 arm64e armv7 armv7s armv6 armv8 EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/DoctorXinjiang/ThirdParty", "$(PROJECT_DIR)/DoctorXinjiang/ThirdParty",
@@ -407,24 +406,26 @@
GCC_PREFIX_HEADER = "$(SRCROOT)/DoctorXinjiang/Supporting Files/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DoctorXinjiang/Supporting Files/PrefixHeader.pch";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "$(SRCROOT)/DoctorXinjiang/Supporting Files/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/DoctorXinjiang/Supporting Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "健康油我专家端";
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_NSCameraUsageDescription = "专家端需要访问您的相机用来您的头像上传是否同意?"; INFOPLIST_KEY_NSCameraUsageDescription = "健康油我专家端需要访问您的相机用来您的头像上传是否同意?";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "始终允许访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "始终允许访问位置信息";
INFOPLIST_KEY_NSLocationUsageDescription = "永不允许访问位置信息"; INFOPLIST_KEY_NSLocationUsageDescription = "永不允许访问位置信息";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "专家端使用期间允许访问位置信息"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "专家端使用期间允许访问位置信息";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "专家端需要访问您的麦克风用来视频录制,是否同意?"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "健康油我专家端需要访问您的麦克风用来视频录制,是否同意?";
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "专家端需要访问你的相册,方便您保存图片,是否同意?"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "健康油我专家端需要访问你的相册,方便您保存图片,是否同意?";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "专家端需要访问您的相册上传图片,方便您的使用,是否同意?"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "专家端需要访问您的相册上传图片,方便您的使用,是否同意?";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.6; INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.DoctorXinjiang; PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.DoctorXinjiang;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -433,20 +434,22 @@
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
VALID_ARCHS = "armv7 arm64 x86_64";
}; };
name = Debug; name = Debug;
}; };
1883A99F2E0A4AD40055089B /* Release */ = { 1883A99F2E0A4AD40055089B /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 89026E00E1DDA04F74446DC0 /* Pods-DoctorXinjiang.release.xcconfig */; baseConfigurationReference = AB6256E214245FBA66E71FC4 /* Pods-DoctorXinjiang.release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = A7CC5LW224; DEVELOPMENT_TEAM = A7CC5LW224;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
EXCLUDED_ARCHS = arm64; EXCLUDED_ARCHS = "";
EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64 = "arm64 arm64e armv7 armv7s armv6 armv8 EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/DoctorXinjiang/ThirdParty", "$(PROJECT_DIR)/DoctorXinjiang/ThirdParty",
@@ -454,24 +457,26 @@
GCC_PREFIX_HEADER = "$(SRCROOT)/DoctorXinjiang/Supporting Files/PrefixHeader.pch"; GCC_PREFIX_HEADER = "$(SRCROOT)/DoctorXinjiang/Supporting Files/PrefixHeader.pch";
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "$(SRCROOT)/DoctorXinjiang/Supporting Files/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/DoctorXinjiang/Supporting Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "健康油我专家端";
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_NSCameraUsageDescription = "专家端需要访问您的相机用来您的头像上传是否同意?"; INFOPLIST_KEY_NSCameraUsageDescription = "健康油我专家端需要访问您的相机用来您的头像上传是否同意?";
INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "始终允许访问位置信息"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "始终允许访问位置信息";
INFOPLIST_KEY_NSLocationUsageDescription = "永不允许访问位置信息"; INFOPLIST_KEY_NSLocationUsageDescription = "永不允许访问位置信息";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "专家端使用期间允许访问位置信息"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "专家端使用期间允许访问位置信息";
INFOPLIST_KEY_NSMicrophoneUsageDescription = "专家端需要访问您的麦克风用来视频录制,是否同意?"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "健康油我专家端需要访问您的麦克风用来视频录制,是否同意?";
INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "专家端需要访问你的相册,方便您保存图片,是否同意?"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "健康油我专家端需要访问你的相册,方便您保存图片,是否同意?";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "专家端需要访问您的相册上传图片,方便您的使用,是否同意?"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "专家端需要访问您的相册上传图片,方便您的使用,是否同意?";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 15.6; INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0.8;
PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.DoctorXinjiang; PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.DoctorXinjiang;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -480,6 +485,7 @@
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
TARGETED_DEVICE_FAMILY = 1; TARGETED_DEVICE_FAMILY = 1;
VALID_ARCHS = "armv7 arm64 x86_64";
}; };
name = Release; name = Release;
}; };
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1883A96E2E0A4AD10055089B"
BuildableName = "DoctorXinjiang.app"
BlueprintName = "DoctorXinjiang"
ReferencedContainer = "container:DoctorXinjiang.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1883A9892E0A4AD40055089B"
BuildableName = "DoctorXinjiangTests.xctest"
BlueprintName = "DoctorXinjiangTests"
ReferencedContainer = "container:DoctorXinjiang.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1883A9932E0A4AD40055089B"
BuildableName = "DoctorXinjiangUITests.xctest"
BlueprintName = "DoctorXinjiangUITests"
ReferencedContainer = "container:DoctorXinjiang.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1883A96E2E0A4AD10055089B"
BuildableName = "DoctorXinjiang.app"
BlueprintName = "DoctorXinjiang"
ReferencedContainer = "container:DoctorXinjiang.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1883A96E2E0A4AD10055089B"
BuildableName = "DoctorXinjiang.app"
BlueprintName = "DoctorXinjiang"
ReferencedContainer = "container:DoctorXinjiang.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -1,6 +1,6 @@
// //
// MQTextField.h // MQTextField.h
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/5/7. // Created by Apple on 2024/5/7.
// //
@@ -1,6 +1,6 @@
// //
// MQTextField.m // MQTextField.m
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/5/7. // Created by Apple on 2024/5/7.
// //
@@ -1,6 +1,6 @@
// //
// UIDevice+model.h // UIDevice+model.h
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/3/29. // Created by Apple on 2024/3/29.
// //
@@ -1,6 +1,6 @@
// //
// UIDevice+model.m // UIDevice+model.m
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/3/29. // Created by Apple on 2024/3/29.
// //
@@ -47,22 +47,17 @@
#define ResourceAddress [NSString stringWithFormat:@"%@/file/show/",Http] #define ResourceAddress [NSString stringWithFormat:@"%@/file/show/",Http]
////新增 //正式
//#define Http [[NSUserDefaults standardUserDefaults] objectForKey:@"HTTPS"] ?: @"https://default.url" //#define Http @"https://api-jkglpt.iosp.ydpt.tech"//
//#define H5DevHost [[NSUserDefaults standardUserDefaults] objectForKey:@"H5DevHost"] ?: @"https://api.cqygjk.com" //#define H5DevHost @"api-jkglpt.iosp.ydpt.tech"//
//#define IntervenH5 [[NSUserDefaults standardUserDefaults] objectForKey:@"H5DevHost"] ?: @"api.cqygjk.com" //#define IntervenH5 @"https://console-jkglpt.iosp.ydpt.tech"
//#define Http UserDefaultObjectForKey(@"HTTPS")// //#define SCHEME @"https" //
//#define H5DevHost UserDefaultObjectForKey(@"H5DevHost")//
//#define IntervenH5 UserDefaultObjectForKey(@"IntervenH5")
//测试
#define Http @"https://xjgateway.mcrm.vip:8888"// #define Http @"https://xj-api.yixiong-tech.com:8081"//
#define H5DevHost @"xjgateway.mcrm.vip:8888"// #define H5DevHost @"xjxc-api.mcrm.vip:8888"//
#define IntervenH5 @"https://xjconsole.mcrm.vip:8888" #define IntervenH5 @"http://10.10.10.228:23006/"
//开发环境地址 #define SCHEME @"https" //
//#define Http @"http://cqyt.dev.yg.dt.io"//
//#define H5DevHost @"cqyt.dev.yg.dt.io"//
//#define IntervenH5 @"http://cms.dev.yg.dt.io"
#endif /* StatusMacros_h */ #endif /* StatusMacros_h */
@@ -28,7 +28,7 @@
//高德key //高德key
#define AMAPSDKKEY @"6f5c1979535a0bea4965d033306c61a7" #define AMAPSDKKEY @"03d421594e9dea3dcdc527b6ebda0b66"
//友盟appster //友盟appster
@@ -9,7 +9,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "YXNetworkingWithCache.h" #import "YXNetworkingWithCache.h"
@interface YXNetAPI : NSObject @interface XJDNetAPI : NSObject
@property (nonatomic,strong) YXNetworkingWithCache * httpRequest; @property (nonatomic,strong) YXNetworkingWithCache * httpRequest;
@@ -100,5 +100,15 @@
- (void)GetDoctorPhyscialIDCardSearch:(NSMutableDictionary *)parmDic; - (void)GetDoctorPhyscialIDCardSearch:(NSMutableDictionary *)parmDic;
- (void)getHistoryReportById:(NSMutableDictionary *)parmDic; - (void)getHistoryReportById:(NSMutableDictionary *)parmDic;
- (void)getSendVideoStart:(NSMutableDictionary *)pamraDic; - (void)getSendVideoStart:(NSMutableDictionary *)pamraDic;
//版本更新
- (void)GetAppVesionUpdata:(NSMutableDictionary *)parmDic;
#pragma mark - 应急求助
- (void)getSOSDoctorRecordList:(NSMutableDictionary *)parmDic;
- (void)getSOSDoctorDetailInfo:(NSMutableDictionary *)parmDic;
- (void)getMyParticipatedOrders:(NSMutableDictionary *)parmDic;
- (void)getActualGroupMemberList:(NSMutableDictionary *)parmDic;
- (void)getSearchEmployee:(NSMutableDictionary *)parmDic;
- (void)getSearchExpert:(NSMutableDictionary *)parmDic;
- (void)postAddGroupUser:(NSMutableDictionary *)parmDic;
@end @end
@@ -6,11 +6,11 @@
// Copyright © 2022 . All rights reserved. // Copyright © 2022 . All rights reserved.
// //
#import "YXNetAPI.h" #import "XJDNetAPI.h"
#define needToken httpRequest.needToken #define needToken httpRequest.needToken
#define isLoginFlag httpRequest.isLoginFlag #define isLoginFlag httpRequest.isLoginFlag
@implementation YXNetAPI @implementation XJDNetAPI
#pragma mark - init方法 #pragma mark - init方法
@synthesize httpRequest; @synthesize httpRequest;
@@ -18,7 +18,7 @@
//token //token
- (instancetype)init:(id)delegate tag:(NSString *)tag - (instancetype)init:(id)delegate tag:(NSString *)tag
{ {
YXUserInfo * user = [HQCommonUtils keyedUnarchiverWithKey:LoginUserInfo]; XJDUserInfo * user = [XJDCommonUtils keyedUnarchiverWithKey:LoginUserInfo];
return [self init:delegate tag:tag NeedToken:user.token]; return [self init:delegate tag:tag NeedToken:user.token];
} }
@@ -28,7 +28,7 @@
if (self=[super init]) { if (self=[super init]) {
if (![tag isEqualToString:@"LOGINGAPI"] || ![tag isEqualToString:@"CHANGEAPI"] ) { if (![tag isEqualToString:@"LOGINGAPI"] || ![tag isEqualToString:@"CHANGEAPI"] ) {
YXUserInfo * user = [HQCommonUtils keyedUnarchiverWithKey:LoginUserInfo]; XJDUserInfo * user = [XJDCommonUtils keyedUnarchiverWithKey:LoginUserInfo];
httpRequest = [[YXNetworkingWithCache alloc] initWithDelegate:delegate bindTag:tag NeedToken:user.token]; httpRequest = [[YXNetworkingWithCache alloc] initWithDelegate:delegate bindTag:tag NeedToken:user.token];
}else{ }else{
@@ -323,11 +323,49 @@
} }
//
- (void)getABMUpdate:(NSMutableDictionary *)parmDic { - (void)getABMUpdate:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:@"https://base.icdat.cn/latest" params:parmDic]; [httpRequest httpGetRequest:@"https://base.icdat.cn/latest" params:parmDic];
} }
//
- (void)GetAppVesionUpdata:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-system/version/getSysVersionDetailByPackageName",Http] params:parmDic];
}
#pragma mark - 应急求助
- (void)getSOSDoctorRecordList:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/initUserOrderPage",Http] params:parmDic];
}
- (void)getSOSDoctorDetailInfo:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/orderInfo",Http] params:parmDic];
}
- (void)getMyParticipatedOrders:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/myParticipatedOrders",Http] params:parmDic];
}
- (void)getActualGroupMemberList:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/getActualGroupMemberList",Http] params:parmDic];
}
- (void)getSearchEmployee:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/searchEmployee",Http] params:parmDic];
}
- (void)getSearchExpert:(NSMutableDictionary *)parmDic {
[httpRequest httpGetRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/order/searchExpert",Http] params:parmDic];
}
- (void)postAddGroupUser:(NSMutableDictionary *)parmDic {
[httpRequest httpPostRequest:[NSString stringWithFormat:@"%@/health-emergency/api/emergency/addGroupUser",Http] params:parmDic];
}
@end @end
@@ -146,7 +146,7 @@ typedef NS_ENUM(NSInteger, RequestType) {
if ([statusCode containsString:@"(401)"]) { if ([statusCode containsString:@"(401)"]) {
DLog(@"%@",error.userInfo); DLog(@"%@",error.userInfo);
[MBProgressHUD showErrorMessage:@"身份验证过期"]; [MBProgressHUD showErrorMessage:@"身份验证过期"];
[HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:nil key:LoginUserInfo];
KPostNotification(KNotificationLoginStateChange, @NO); KPostNotification(KNotificationLoginStateChange, @NO);
}else{ }else{
[MBProgressHUD showErrorMessage:@"网络服务错误"]; [MBProgressHUD showErrorMessage:@"网络服务错误"];
@@ -165,7 +165,7 @@ typedef NS_ENUM(NSInteger, RequestType) {
if ([statusCode containsString:@"(401)"]) { if ([statusCode containsString:@"(401)"]) {
DLog(@"%@",error.userInfo); DLog(@"%@",error.userInfo);
[EasyTextView showErrorText:@"身份验证过期"]; [EasyTextView showErrorText:@"身份验证过期"];
[HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:nil key:LoginUserInfo];
KPostNotification(KNotificationLoginStateChange, @NO); KPostNotification(KNotificationLoginStateChange, @NO);
}else }else
{ {
@@ -186,7 +186,7 @@ typedef NS_ENUM(NSInteger, RequestType) {
if ([statusCode containsString:@"(401)"]) { if ([statusCode containsString:@"(401)"]) {
DLog(@"%@",error.userInfo); DLog(@"%@",error.userInfo);
[EasyTextView showErrorText:@"身份验证过期"]; [EasyTextView showErrorText:@"身份验证过期"];
[HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:nil key:LoginUserInfo];
KPostNotification(KNotificationLoginStateChange, @NO); KPostNotification(KNotificationLoginStateChange, @NO);
} }
else else
@@ -311,7 +311,7 @@ typedef NS_ENUM(NSInteger, RequestType) {
} }
if (flag == true) { if (flag == true) {
DLog(@" 返回Json\n%@\n %@", [HQCommonUtils DataTOjsonString:response],url); DLog(@" 返回Json\n%@\n %@", [XJDCommonUtils DataTOjsonString:response],url);
if ([response.allKeys containsObject:@"result"]) { if ([response.allKeys containsObject:@"result"]) {
[self showSuccess:[response objectForKey:@"result"]]; [self showSuccess:[response objectForKey:@"result"]];
} }
@@ -1,6 +1,6 @@
// //
// ESCTUIManager.h // ESCTUIManager.h
// EscortProject // DoctorXinjiang
// //
// Created by 仁康信息 on 2023/2/16. // Created by 仁康信息 on 2023/2/16.
// //
@@ -1,6 +1,6 @@
// //
// ESCTUIManager.m // ESCTUIManager.m
// EscortProject // DoctorXinjiang
// //
// Created by 仁康信息 on 2023/2/16. // Created by 仁康信息 on 2023/2/16.
// //
@@ -1,5 +1,5 @@
// YXKeychainTool.h // XJDKeychainTool.h
// idleBuy // idleBuy
// //
// Created by ios on 2018/5/28. // Created by ios on 2018/5/28.
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <Security/Security.h> #import <Security/Security.h>
@interface YXKeychainTool : NSObject @interface XJDKeychainTool : NSObject
/** /**
* 🔑 * 🔑
* *
@@ -5,9 +5,9 @@
// Copyright © 2017 . All rights reserved. // Copyright © 2017 . All rights reserved.
// //
#import "YXKeychainTool.h" #import "XJDKeychainTool.h"
@implementation YXKeychainTool @implementation XJDKeychainTool
+ (NSMutableDictionary *)getKeychainQuery:(NSString *)service{ + (NSMutableDictionary *)getKeychainQuery:(NSString *)service{
return [NSMutableDictionary dictionaryWithObjectsAndKeys: return [NSMutableDictionary dictionaryWithObjectsAndKeys:
(__bridge_transfer id)kSecClassGenericPassword, (__bridge_transfer id)kSecClassGenericPassword,
@@ -1,5 +1,5 @@
// //
// YXUserInfo.h // XJDUserInfo.h
// idleBuy // idleBuy
// //
// Created by ios on 2018/5/30. // Created by ios on 2018/5/30.
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@interface YXUserInfo : NSObject @interface XJDUserInfo : NSObject
@property (nonatomic, strong) NSDictionary *userInfo; @property (nonatomic, strong) NSDictionary *userInfo;
@@ -6,9 +6,9 @@
// Copyright © 2018 ios. All rights reserved. // Copyright © 2018 ios. All rights reserved.
// //
#import "YXUserInfo.h" #import "XJDUserInfo.h"
@implementation YXUserInfo @implementation XJDUserInfo
- (void)encodeWithCoder:(NSCoder *)aCoder - (void)encodeWithCoder:(NSCoder *)aCoder
{ {
[aCoder encodeObject:self.userInfo forKey:@"userInfo"]; [aCoder encodeObject:self.userInfo forKey:@"userInfo"];
@@ -7,7 +7,7 @@
#import "AppDelegate+AppService.h" #import "AppDelegate+AppService.h"
#import "YXBaseTabBarController.h" #import "YXBaseTabBarController.h"
#import "YXLoginViewController.h" #import "XJDLoginViewController.h"
#import <IQKeyboardManager/IQKeyboardManager.h> #import <IQKeyboardManager/IQKeyboardManager.h>
#import <AMapFoundationKit/AMapFoundationKit.h> #import <AMapFoundationKit/AMapFoundationKit.h>
#import <AMapFoundationKit/AMapServices.h> #import <AMapFoundationKit/AMapServices.h>
@@ -30,7 +30,7 @@
selector:@selector(loginStateChange:) selector:@selector(loginStateChange:)
name:KNotificationLoginStateChange name:KNotificationLoginStateChange
object:nil]; object:nil];
if ([HQCommonUtils isLogin]) { if ([XJDCommonUtils isLogin]) {
//腾讯im //腾讯im
V2TIMSDKConfig *config = [[V2TIMSDKConfig alloc] init]; V2TIMSDKConfig *config = [[V2TIMSDKConfig alloc] init];
@@ -46,13 +46,13 @@
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
self.window.backgroundColor = KWhiteColor; self.window.backgroundColor = KWhiteColor;
//直接进入显示登录页面 //直接进入显示登录页面
if ([HQCommonUtils isLogin]) { if ([XJDCommonUtils isLogin]) {
self.mainTabBar = [YXBaseTabBarController new]; self.mainTabBar = [YXBaseTabBarController new];
self.mainTabBar.delegate =self; self.mainTabBar.delegate =self;
self.window.rootViewController = self.mainTabBar; self.window.rootViewController = self.mainTabBar;
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
}else { }else {
YXLoginViewController * loginvc = [[YXLoginViewController alloc] init]; XJDLoginViewController * loginvc = [[XJDLoginViewController alloc] init];
YXBaseNavigationController * nav = [[YXBaseNavigationController alloc] initWithRootViewController:loginvc]; YXBaseNavigationController * nav = [[YXBaseNavigationController alloc] initWithRootViewController:loginvc];
self.window.rootViewController = nav; self.window.rootViewController = nav;
} }
@@ -110,7 +110,7 @@
paragraphStyle.alignment = NSTextAlignmentLeft; 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, NSParagraphStyleAttributeName:paragraphStyle,
}]; }];
@@ -184,19 +184,11 @@
} }
- (void)loginImAccount {
YXNetAPI * proctocolApi = [[YXNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil];
[proctocolApi GetIMLoginAccount:nil];
}
//在线时票据过期:此时您需要生成新的 userSig,并再次重新调用初始化。 //在线时票据过期:此时您需要生成新的 userSig,并再次重新调用初始化。
- (void)onKickedOffline { - (void)onKickedOffline {
[HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:nil key:LoginUserInfo];
[ESCTUIManager outLoginTUISDK]; [ESCTUIManager outLoginTUISDK];
KPostNotification(KNotificationLoginStateChange, @NO); KPostNotification(KNotificationLoginStateChange, @NO);
@@ -1,25 +0,0 @@
//
// YXBaseTabBarController.h
// healthQuestion
//
// Created by xulei on 2022/8/12.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXBaseTabBarController : UITabBarController
/**
设置小红点
@param index tabbar下标
@param isShow 是显示还是隐藏
*/
-(void)setRedDotWithIndex:(NSInteger)index isShow:(BOOL)isShow isNumber:(NSInteger)number;
@property (nonatomic, assign)NSInteger lastSelectIndex;
@end
NS_ASSUME_NONNULL_END
@@ -1,42 +0,0 @@
//
// YXBaseWebViewController.h
// healthQuestion
//
// Created by 仁康信息 on 2024/1/12.
//
#import "YXBaseViewController.h"
#import <WebKit/WebKit.h>
#import <JavaScriptCore/JavaScriptCore.h>
NS_ASSUME_NONNULL_BEGIN
typedef enum {
WkJSMessageTypeDefault = 0,
WkJSMessageTypeBack = 1,
}WkJSMessageType;
typedef enum {
RightDefaultType = 0,
RightCompleteType = 1,
}RightNavType;
@protocol WebJSExport <JSExport>
- (void)startFunction;
@end
@interface YXBaseWebViewController : YXBaseViewController<UIAlertViewDelegate,WKNavigationDelegate, WKUIDelegate, WebJSExport, WKScriptMessageHandler>
@property (nonatomic, strong) NSString *webUrl;
@property (nonatomic, strong) NSString *webTitle;
@property (nonatomic, strong) JSContext *context;
@property (nonatomic, strong) WKWebView *wkWebView;
@property (nonatomic, assign) RightNavType rightType;
- (void)webViewRequest;
@end
NS_ASSUME_NONNULL_END
@@ -7,8 +7,8 @@
#import "YXBaseTabBarController.h" #import "YXBaseTabBarController.h"
#import "HQTabBar.h" #import "HQTabBar.h"
#import "YXHomePageViewController.h" #import "XJDHomePageViewController.h"
#import "YXMineViewController.h" #import "XJDMineViewController.h"
@interface YXBaseTabBarController ()<UITabBarControllerDelegate> @interface YXBaseTabBarController ()<UITabBarControllerDelegate>
@@ -86,13 +86,13 @@
-(void)setUpAllChildViewController{ -(void)setUpAllChildViewController{
_VCS = @[].mutableCopy; _VCS = @[].mutableCopy;
YXHomePageViewController *homeVC = [[YXHomePageViewController alloc]init]; XJDHomePageViewController *homeVC = [[XJDHomePageViewController alloc]init];
[self setupChildViewController:homeVC title:@"工作台" imageName:@"homeTabar_nomarl" seleceImageName:@"homeTabar_selected"]; [self setupChildViewController:homeVC title:@"工作台" imageName:@"homeTabar_nomarl" seleceImageName:@"homeTabar_selected"];
YXMineViewController *mineVC = [[YXMineViewController alloc]init]; XJDMineViewController *mineVC = [[XJDMineViewController alloc]init];
[self setupChildViewController:mineVC title:@"我的" imageName:@"mianTabar_nomarl" seleceImageName:@"mianTabar_selected"]; [self setupChildViewController:mineVC title:@"我的" imageName:@"mianTabar_nomarl" seleceImageName:@"mianTabar_selected"];
self.viewControllers = _VCS; self.viewControllers = _VCS;
@@ -6,7 +6,7 @@
// //
#import "YXBaseViewController.h" #import "YXBaseViewController.h"
#import "YXLoginViewController.h" #import "XJDLoginViewController.h"
@interface YXBaseViewController ()<MBProgressHUDDelegate> @interface YXBaseViewController ()<MBProgressHUDDelegate>
@@ -85,7 +85,7 @@
}else }else
{ {
YXLoginViewController *loginVC = [[YXLoginViewController alloc]init]; XJDLoginViewController *loginVC = [[XJDLoginViewController alloc]init];
UINavigationController * nav = [[UINavigationController alloc] initWithRootViewController:loginVC]; UINavigationController * nav = [[UINavigationController alloc] initWithRootViewController:loginVC];
[[kAppDelegate getCurrentVC] presentViewController:nav animated:YES completion:nil]; [[kAppDelegate getCurrentVC] presentViewController:nav animated:YES completion:nil];
} }
@@ -1,5 +1,5 @@
// //
// HQShowPromptPopView.h // XJDShowPromptPopView.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2022/9/28. // Created by 仁康信息 on 2022/9/28.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface HQShowPromptPopView : UIView @interface XJDShowPromptPopView : UIView
@end @end
@@ -1,13 +1,13 @@
// //
// HQShowPromptPopView.m // XJDShowPromptPopView.m
// healthQuestion // healthQuestion
// //
// Created by on 2022/9/28. // Created by on 2022/9/28.
// //
#import "HQShowPromptPopView.h" #import "XJDShowPromptPopView.h"
@implementation HQShowPromptPopView @implementation XJDShowPromptPopView
- (instancetype)initWithFrame:(CGRect)frame { - (instancetype)initWithFrame:(CGRect)frame {
@@ -1,5 +1,5 @@
// //
// YXFileDataDetailViewController.h // XJDFileDataDetailViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/5/4. // Created by 仁康信息 on 2023/5/4.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXFileDataDetailViewController : YXBaseViewController @interface XJDFileDataDetailViewController : YXBaseViewController
@property (nonatomic, copy) NSString * record_id; @property (nonatomic, copy) NSString * record_id;
@@ -1,32 +1,32 @@
// //
// YXFileDataDetailViewController.m // XJDFileDataDetailViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/5/4. // Created by on 2023/5/4.
// //
#import "YXFileDataDetailViewController.h" #import "XJDFileDataDetailViewController.h"
#import "DetailTitleView.h" #import "XJDDetailTitleView.h"
#import "DetailUserInfoView.h" #import "XJDDetailUserInfoView.h"
#import "FileDataDeatilCenterView.h" #import "XJDFileDataDeatilCenterView.h"
#import "BasicHealthInfoView.h" #import "XJDBasicHealthInfoView.h"
#import "YXRecoredListDetailModel.h" #import "XJDRecoredListDetailModel.h"
@interface YXFileDataDetailViewController () @interface XJDFileDataDetailViewController ()
@property (nonatomic, strong) DetailUserInfoView * infoView ; @property (nonatomic, strong) XJDDetailUserInfoView * infoView ;
@property (nonatomic, strong) FileDataDeatilCenterView * detailView ; @property (nonatomic, strong) XJDFileDataDeatilCenterView * detailView ;
@property (nonatomic, strong) BasicHealthInfoView * healthView; @property (nonatomic, strong) XJDBasicHealthInfoView * healthView;
@property (nonatomic, strong) DetailTitleView * titleview; @property (nonatomic, strong) XJDDetailTitleView * titleview;
@end @end
@implementation YXFileDataDetailViewController @implementation XJDFileDataDetailViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
@@ -54,27 +54,27 @@
mainScrollView.backgroundColor = KClearColor; mainScrollView.backgroundColor = KClearColor;
[self.view addSubview:mainScrollView]; [self.view addSubview:mainScrollView];
DetailTitleView * titleview = [[DetailTitleView alloc] initWithFrame:CGRectMake(0, 0, mainScrollView.width, 33)]; XJDDetailTitleView * titleview = [[XJDDetailTitleView alloc] initWithFrame:CGRectMake(0, 0, mainScrollView.width, 33)];
self.titleview = titleview; self.titleview = titleview;
[mainScrollView addSubview:titleview]; [mainScrollView addSubview:titleview];
// //
DetailUserInfoView * infoView = [[DetailUserInfoView alloc] initWithFrame:CGRectMake(0, titleview.bottom, kScreenWidth - kRealValue(30), kRealValue(103))]; XJDDetailUserInfoView * infoView = [[XJDDetailUserInfoView alloc] initWithFrame:CGRectMake(0, titleview.bottom, kScreenWidth - kRealValue(30), kRealValue(103))];
self.infoView = infoView; self.infoView = infoView;
infoView.backgroundColor = KWhiteColor; infoView.backgroundColor = KWhiteColor;
[mainScrollView addSubview:infoView]; [mainScrollView addSubview:infoView];
// //
FileDataDeatilCenterView * detailView = [[FileDataDeatilCenterView alloc] initWithFrame:CGRectMake(0, infoView.bottom + kRealValue(10), mainScrollView.width, 500)]; XJDFileDataDeatilCenterView * detailView = [[XJDFileDataDeatilCenterView alloc] initWithFrame:CGRectMake(0, infoView.bottom + kRealValue(10), mainScrollView.width, 500)];
[mainScrollView addSubview:detailView]; [mainScrollView addSubview:detailView];
detailView.height = detailView.questionH; detailView.height = detailView.questionH;
detailView.layer.cornerRadius = 10; detailView.layer.cornerRadius = 10;
self.detailView = detailView; self.detailView = detailView;
[HQCommonUtils addShadowToView:detailView]; [XJDCommonUtils addShadowToView:detailView];
BasicHealthInfoView * healthView = [[BasicHealthInfoView alloc] initWithFrame:CGRectMake(0,detailView.bottom + kRealValue(15), kScreenWidth - kRealValue(30), kRealValue(280))]; XJDBasicHealthInfoView * healthView = [[XJDBasicHealthInfoView alloc] initWithFrame:CGRectMake(0,detailView.bottom + kRealValue(15), kScreenWidth - kRealValue(30), kRealValue(280))];
healthView.backgroundColor = [UIColor whiteColor]; healthView.backgroundColor = [UIColor whiteColor];
healthView.layer.cornerRadius = 10.0; healthView.layer.cornerRadius = 10.0;
[HQCommonUtils addShadowToView:healthView]; [XJDCommonUtils addShadowToView:healthView];
self.healthView = healthView; self.healthView = healthView;
[mainScrollView addSubview:healthView]; [mainScrollView addSubview:healthView];
@@ -88,7 +88,7 @@
[parmDic setObject:self.record_id forKey:@"id"]; [parmDic setObject:self.record_id forKey:@"id"];
YXNetAPI * recordApi = [[YXNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; XJDNetAPI * recordApi = [[XJDNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""];
[recordApi fileDetatilData:parmDic]; [recordApi fileDetatilData:parmDic];
} }
@@ -108,13 +108,13 @@
NSDictionary * dic = response; NSDictionary * dic = response;
YXRecoredListDetailModel * model = [YXRecoredListDetailModel modelWithDictionary:dic]; XJDRecoredListDetailModel * model = [XJDRecoredListDetailModel modelWithDictionary:dic];
// //
YXReocrdconFamilyMembersDO * infoModel = [YXReocrdconFamilyMembersDO modelWithDictionary:model.conFamilyMembersDO]; XJDReocrdconFamilyMembersDO * infoModel = [XJDReocrdconFamilyMembersDO modelWithDictionary:model.conFamilyMembersDO];
self.infoView.userInfo = infoModel; self.infoView.userInfo = infoModel;
// //
YXRecoredconMedicalRecordsListDO * medicalModel = [YXRecoredconMedicalRecordsListDO modelWithDictionary:model.conMedicalRecordsDO]; XJDRecoredconMedicalRecordsListDO * medicalModel = [XJDRecoredconMedicalRecordsListDO modelWithDictionary:model.conMedicalRecordsDO];
self.detailView.medicalModel = medicalModel; self.detailView.medicalModel = medicalModel;
self.titleview.createTime = medicalModel.createTime; self.titleview.createTime = medicalModel.createTime;
@@ -142,16 +142,16 @@
*/ */
// //
//#import "YXFileDataDetailViewController.h" //#import "XJDFileDataDetailViewController.h"
//#import "DetailTitleView.h" //#import "XJDDetailTitleView.h"
//#import "DetailUserInfoView.h" //#import "DetailUserInfoView.h"
//#import "FileDataDeatilCenterView.h" //#import "XJDFileDataDeatilCenterView.h"
//#import "BasicHealthInfoView.h" //#import "XJDBasicHealthInfoView.h"
//#import "XLPhotoBrowser.h" //#import "XLPhotoBrowser.h"
//#import "DoctorReportModel.h" //#import "DoctorReportModel.h"
//@interface YXFileDataDetailViewController () //@interface XJDFileDataDetailViewController ()
// //
//@property (nonatomic, strong) DetailTitleView * titleview; //@property (nonatomic, strong) XJDDetailTitleView * titleview;
// //
// //
//@property (nonatomic, strong) UIScrollView * mainScrollView; //@property (nonatomic, strong) UIScrollView * mainScrollView;
@@ -180,7 +180,7 @@
// //
//@end //@end
// //
//@implementation YXFileDataDetailViewController //@implementation XJDFileDataDetailViewController
// //
//- (NSMutableArray *)healthArray { //- (NSMutableArray *)healthArray {
// //
@@ -240,11 +240,11 @@
// mainScrollView.backgroundColor = KClearColor; // mainScrollView.backgroundColor = KClearColor;
// [self.view addSubview:mainScrollView]; // [self.view addSubview:mainScrollView];
// //
// DetailTitleView * titleview = [[DetailTitleView alloc] initWithFrame:CGRectMake(0, 0, mainScrollView.width, 33)]; // XJDDetailTitleView * titleview = [[XJDDetailTitleView alloc] initWithFrame:CGRectMake(0, 0, mainScrollView.width, 33)];
// self.titleview = titleview; // self.titleview = titleview;
// [mainScrollView addSubview:titleview]; // [mainScrollView addSubview:titleview];
// //
// DetailUserInfoView * infoView = [[DetailUserInfoView alloc] initWithFrame:CGRectMake(0, titleview.bottom, kScreenWidth - kRealValue(30), kRealValue(103))]; // XJDDetailUserInfoView * infoView = [[XJDDetailUserInfoView alloc] initWithFrame:CGRectMake(0, titleview.bottom, kScreenWidth - kRealValue(30), kRealValue(103))];
// infoView.backgroundColor = KWhiteColor; // infoView.backgroundColor = KWhiteColor;
// self.userView = infoView; // self.userView = infoView;
// [mainScrollView addSubview:infoView]; // [mainScrollView addSubview:infoView];
@@ -392,7 +392,7 @@
// hosLeftLabel.textColor = UIColorHex(#666666); // hosLeftLabel.textColor = UIColorHex(#666666);
// hosLeftLabel.font = SYSTEMFONT(13); // hosLeftLabel.font = SYSTEMFONT(13);
// hosLeftLabel.textAlignment = NSTextAlignmentLeft; // hosLeftLabel.textAlignment = NSTextAlignmentLeft;
// CGFloat hosW = [HQCommonUtils getLengthFromText: @"就诊医院及科室:" andFontSize:13]; // CGFloat hosW = [XJDCommonUtils getLengthFromText: @"就诊医院及科室:" andFontSize:13];
// hosLeftLabel.width = hosW; // hosLeftLabel.width = hosW;
// [self.hospationView addSubview:hosLeftLabel]; // [self.hospationView addSubview:hosLeftLabel];
// //
@@ -412,7 +412,7 @@
// sickLeftLabel.font = SYSTEMFONT(13); // sickLeftLabel.font = SYSTEMFONT(13);
// sickLeftLabel.textAlignment = NSTextAlignmentLeft; // sickLeftLabel.textAlignment = NSTextAlignmentLeft;
// self.sickLeftLabel = sickLeftLabel; // self.sickLeftLabel = sickLeftLabel;
// CGFloat sickW = [HQCommonUtils getLengthFromText: @"诊断的疾病名:" andFontSize:13]; // CGFloat sickW = [XJDCommonUtils getLengthFromText: @"诊断的疾病名:" andFontSize:13];
// sickLeftLabel.width = hosW; // sickLeftLabel.width = hosW;
// [self.hospationView addSubview:sickLeftLabel]; // [self.hospationView addSubview:sickLeftLabel];
// //
@@ -468,7 +468,7 @@
// //
// leftLabel.text = leftText; // leftLabel.text = leftText;
// //
// CGFloat w = [HQCommonUtils getLengthFromText:leftText andFontSize:13]; // CGFloat w = [XJDCommonUtils getLengthFromText:leftText andFontSize:13];
// //
// leftLabel.font = SYSTEMFONT(13); // leftLabel.font = SYSTEMFONT(13);
// //
@@ -509,7 +509,7 @@
// [parmDic setObject:self.record_id forKey:@"id"]; // [parmDic setObject:self.record_id forKey:@"id"];
// } // }
// //
// YXNetAPI * recordApi = [[YXNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""]; // XJDNetAPI * recordApi = [[XJDNetAPI alloc] init:self tag:@"RECORD" NeedToken:@""];
// //
// [recordApi fileDetatilData:parmDic]; // [recordApi fileDetatilData:parmDic];
// //
@@ -619,11 +619,11 @@
// self.hospationView.hidden = false; // self.hospationView.hidden = false;
// //
// self.sicksLabel.text = [NSString stringWithFormat:@"%@",recordModel.lookOffice]; // self.sicksLabel.text = [NSString stringWithFormat:@"%@",recordModel.lookOffice];
// self.sicksLabel.height = [HQCommonUtils getSpaceLabelHeight:self.sicksLabel withStr:self.sicksLabel.text withFont:[UIFont systemFontOfSize:14] withWidth:self.sicksLabel.width withLineSpacing:5]; // self.sicksLabel.height = [XJDCommonUtils getSpaceLabelHeight:self.sicksLabel withStr:self.sicksLabel.text withFont:[UIFont systemFontOfSize:14] withWidth:self.sicksLabel.width withLineSpacing:5];
// //
// self.hospationNameLabel.text = [NSString stringWithFormat:@"%@",recordModel.lookMedicalName]; // self.hospationNameLabel.text = [NSString stringWithFormat:@"%@",recordModel.lookMedicalName];
// //
// self.hospationNameLabel.height = [HQCommonUtils getSpaceLabelHeight:self.sicksLabel withStr:self.sicksLabel.text withFont:[UIFont systemFontOfSize:14] withWidth:self.sicksLabel.width withLineSpacing:5]; // self.hospationNameLabel.height = [XJDCommonUtils getSpaceLabelHeight:self.sicksLabel withStr:self.sicksLabel.text withFont:[UIFont systemFontOfSize:14] withWidth:self.sicksLabel.width withLineSpacing:5];
// //
// self.sickLeftLabel.top = self.hospationNameLabel.bottom + kRealValue(17); // self.sickLeftLabel.top = self.hospationNameLabel.bottom + kRealValue(17);
// //
@@ -1,5 +1,5 @@
// //
// YXHistoricalRecordViewController.h // XJDHistoricalRecordViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/5/4. // Created by 仁康信息 on 2023/5/4.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXHistoricalRecordViewController : YXBaseViewController @interface XJDHistoricalRecordViewController : YXBaseViewController
@end @end
@@ -1,21 +1,21 @@
// //
// YXHistoricalRecordViewController.m // XJDHistoricalRecordViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/5/4. // Created by on 2023/5/4.
// //
#import "YXHistoricalRecordViewController.h" #import "XJDHistoricalRecordViewController.h"
#import "HQSearchView.h" #import "XJDSearchView.h"
#import "HistoryRecordTable.h" #import "XJDHistoryRecordTable.h"
@interface YXHistoricalRecordViewController () @interface XJDHistoricalRecordViewController ()
@property (nonatomic, strong) HistoryRecordTable * homeTable; @property (nonatomic, strong) XJDHistoryRecordTable * homeTable;
@end @end
@implementation YXHistoricalRecordViewController @implementation XJDHistoricalRecordViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
@@ -33,7 +33,7 @@
topView.backgroundColor = KWhiteColor; topView.backgroundColor = KWhiteColor;
[self.view addSubview:topView]; [self.view addSubview:topView];
HQSearchView * seacrhView = [[HQSearchView alloc] initWithFrame:CGRectMake(0, 8, kScreenWidth, 35)]; XJDSearchView * seacrhView = [[XJDSearchView alloc] initWithFrame:CGRectMake(0, 8, kScreenWidth, 35)];
seacrhView.backgroundColor = KWhiteColor; seacrhView.backgroundColor = KWhiteColor;
seacrhView.searchPlacehold = @"输入关键字搜索"; seacrhView.searchPlacehold = @"输入关键字搜索";
seacrhView.searchBlock = ^(NSString * _Nonnull fieldtext) { seacrhView.searchBlock = ^(NSString * _Nonnull fieldtext) {
@@ -41,7 +41,7 @@
}; };
[topView addSubview:seacrhView]; [topView addSubview:seacrhView];
self.homeTable = [[HistoryRecordTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; self.homeTable = [[XJDHistoryRecordTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
[self.view addSubview:self.homeTable]; [self.view addSubview:self.homeTable];
@@ -1,6 +1,6 @@
// //
// YXCQAudioPlayManager.h // XJDCQAudioPlayManager.h
// EscortProject // DoctorXinjiang
// //
// Created by 仁康信息 on 2023/12/5. // Created by 仁康信息 on 2023/12/5.
// //
@@ -10,7 +10,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXCQAudioPlayManager : NSObject @interface XJDCQAudioPlayManager : NSObject
+ (AVPlayer *)initWhithUrl:(NSURL *)avUrl; + (AVPlayer *)initWhithUrl:(NSURL *)avUrl;
@@ -1,13 +1,13 @@
// //
// YXCQAudioPlayManager.m // XJDCQAudioPlayManager.m
// EscortProject // DoctorXinjiang
// //
// Created by on 2023/12/5. // Created by on 2023/12/5.
// //
#import "YXCQAudioPlayManager.h" #import "XJDCQAudioPlayManager.h"
@implementation YXCQAudioPlayManager @implementation XJDCQAudioPlayManager
+ (AVPlayer *)initWhithUrl:(NSURL *)avUrl { + (AVPlayer *)initWhithUrl:(NSURL *)avUrl {
@@ -1,6 +1,6 @@
// //
// YXDownToolsManager.h // XJDDownToolsManager.h
// EscortProject // DoctorXinjiang
// //
// Created by 仁康信息 on 2023/12/1. // Created by 仁康信息 on 2023/12/1.
// //
@@ -10,7 +10,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXDownToolsManager : NSObject <ReaderViewControllerDelegate> @interface XJDDownToolsManager : NSObject <ReaderViewControllerDelegate>
+ (void)downLoadReportWithURL:(NSString *)PDFURL withFileName:(NSString *)fileName; + (void)downLoadReportWithURL:(NSString *)PDFURL withFileName:(NSString *)fileName;
@@ -1,12 +1,12 @@
// //
// YXDownToolsManager.m // XJDDownToolsManager.m
// EscortProject // DoctorXinjiang
// //
// Created by on 2023/12/1. // Created by on 2023/12/1.
// //
#import "YXDownToolsManager.h" #import "XJDDownToolsManager.h"
@implementation YXDownToolsManager @implementation XJDDownToolsManager
+ (void)downLoadReportWithURL:(NSString *)PDFURL withFileName:(NSString *)fileName + (void)downLoadReportWithURL:(NSString *)PDFURL withFileName:(NSString *)fileName
{ {
@@ -65,7 +65,7 @@
ReaderViewController *readerViewController = [[ReaderViewController alloc] initWithReaderDocument:document]; ReaderViewController *readerViewController = [[ReaderViewController alloc] initWithReaderDocument:document];
readerViewController.delegate = self; readerViewController.delegate = self;
[[HQCommonUtils getCurrentVC] presentViewController:readerViewController animated:YES completion:nil]; [[XJDCommonUtils getCurrentVC] presentViewController:readerViewController animated:YES completion:nil];
} }
}else{ }else{
@@ -82,7 +82,7 @@
} }
#pragma mark ReaderViewControllerDelegate因为PDF阅读器可能是push出来的,也可能是present出来的,为了更好的效果,这个代理方法可以实现很好的退出 #pragma mark ReaderViewControllerDelegate因为PDF阅读器可能是push出来的,也可能是present出来的,为了更好的效果,这个代理方法可以实现很好的退出
+ (void)dismissReaderViewController:(ReaderViewController *)viewController{ + (void)dismissReaderViewController:(ReaderViewController *)viewController{
[[HQCommonUtils getCurrentVC] dismissViewControllerAnimated:YES completion:nil]; [[XJDCommonUtils getCurrentVC] dismissViewControllerAnimated:YES completion:nil];
} }
#pragma 判断文件是否存在 #pragma 判断文件是否存在
@@ -1,6 +1,6 @@
// //
// YXHealthPhyReportModel.h // XJDHealthPhyReportModel.h
// EscortProject // DoctorXinjiang
// //
// Created by 仁康信息 on 2023/8/28. // Created by 仁康信息 on 2023/8/28.
// //
@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
//新增影像报告 //新增影像报告
@interface YXThirdResultResModel : NSObject @interface XJDThirdResultResModel : NSObject
@property (nonatomic, copy) NSString * third_tId; @property (nonatomic, copy) NSString * third_tId;
@property (nonatomic, copy) NSString * type; @property (nonatomic, copy) NSString * type;
@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface YXImageItemListModel : NSObject @interface XJDImageItemListModel : NSObject
@property (nonatomic, copy) NSString * imageCheckName; @property (nonatomic, copy) NSString * imageCheckName;
@property (nonatomic, copy) NSString * imageShowUrl; @property (nonatomic, copy) NSString * imageShowUrl;
@@ -44,27 +44,27 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface YXSenResultResModel : NSObject @interface XJDSenResultResModel : NSObject
@property (nonatomic, copy) NSString * uniItemClassId; @property (nonatomic, copy) NSString * uniItemClassId;
@property (nonatomic, copy) NSString * uniItemClassName; @property (nonatomic, copy) NSString * uniItemClassName;
@property (nonatomic, strong) NSArray<YXThirdResultResModel *> * thirdResultRes; @property (nonatomic, strong) NSArray<XJDThirdResultResModel *> * thirdResultRes;
@end @end
@interface YXResultItemResListModel : NSObject @interface XJDResultItemResListModel : NSObject
@property (nonatomic, copy) NSString * analysisId; @property (nonatomic, copy) NSString * analysisId;
@property (nonatomic, copy) NSString * analysisName; @property (nonatomic, copy) NSString * analysisName;
@property (nonatomic, copy) NSString * empBirthday; @property (nonatomic, copy) NSString * empBirthday;
@property (nonatomic, copy) NSString * medicalYear; @property (nonatomic, copy) NSString * medicalYear;
@property (nonatomic, assign) NSInteger rowNumber; @property (nonatomic, assign) NSInteger rowNumber;
@property (nonatomic, strong) NSArray<YXSenResultResModel *> * senResultRes; @property (nonatomic, strong) NSArray<XJDSenResultResModel *> * senResultRes;
@property (nonatomic, strong) NSArray<YXThirdResultResModel *> * allResultArray; @property (nonatomic, strong) NSArray<XJDThirdResultResModel *> * allResultArray;
@end @end
@interface YXHealthPhyReportModel : NSObject @interface XJDHealthPhyReportModel : NSObject
@property (nonatomic, copy) NSString * report_id; @property (nonatomic, copy) NSString * report_id;
@property (nonatomic, copy) NSString * userId; @property (nonatomic, copy) NSString * userId;
@@ -89,9 +89,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, strong) NSArray<YXResultItemResListModel *> * resultItemResList; @property (nonatomic, strong) NSArray<XJDResultItemResListModel *> * resultItemResList;
@property (nonatomic, strong) NSArray<YXImageItemListModel *> * imageItemList; @property (nonatomic, strong) NSArray<XJDImageItemListModel *> * imageItemList;
@end @end
@@ -1,13 +1,13 @@
// //
// YXHealthPhyReportModel.m // XJDHealthPhyReportModel.m
// EscortProject // DoctorXinjiang
// //
// Created by on 2023/8/28. // Created by on 2023/8/28.
// //
#import "YXHealthPhyReportModel.h" #import "XJDHealthPhyReportModel.h"
@implementation YXThirdResultResModel @implementation XJDThirdResultResModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {
@@ -18,20 +18,20 @@
@end @end
@implementation YXImageItemListModel @implementation XJDImageItemListModel
@end @end
@implementation YXSenResultResModel @implementation XJDSenResultResModel
+ (NSDictionary *)modelContainerPropertyGenericClass + (NSDictionary *)modelContainerPropertyGenericClass
{ {
return @{ return @{
@"thirdResultRes":[YXThirdResultResModel class] @"thirdResultRes":[XJDThirdResultResModel class]
}; };
} }
@@ -40,14 +40,14 @@
@end @end
@implementation YXResultItemResListModel @implementation XJDResultItemResListModel
+ (NSDictionary *)modelContainerPropertyGenericClass + (NSDictionary *)modelContainerPropertyGenericClass
{ {
return @{ return @{
@"senResultRes":[YXSenResultResModel class], @"senResultRes":[XJDSenResultResModel class],
@"allResultArray":[YXThirdResultResModel class] @"allResultArray":[XJDThirdResultResModel class]
}; };
} }
@@ -56,7 +56,7 @@
@end @end
@implementation YXHealthPhyReportModel @implementation XJDHealthPhyReportModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {
@@ -69,8 +69,8 @@
{ {
return @{ return @{
@"resultItemResList":[YXResultItemResListModel class], @"resultItemResList":[XJDResultItemResListModel class],
@"imageItemList":[YXImageItemListModel class] @"imageItemList":[XJDImageItemListModel class]
}; };
} }
@@ -1,6 +1,6 @@
// //
// YXLookReportImageViewController.h // XJDLookReportImageViewController.h
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/2/26. // Created by Apple on 2024/2/26.
// //
@@ -10,7 +10,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXLookReportImageViewController : YXBaseViewController @interface XJDLookReportImageViewController : YXBaseViewController
@property (nonatomic, strong) NSString * webTitle; @property (nonatomic, strong) NSString * webTitle;
@@ -1,13 +1,13 @@
// //
// YXLookReportImageViewController.m // XJDLookReportImageViewController.m
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/2/26. // Created by Apple on 2024/2/26.
// //
#import "YXLookReportImageViewController.h" #import "XJDLookReportImageViewController.h"
@interface YXLookReportImageViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate> @interface XJDLookReportImageViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate>
@property (nonatomic, strong)NSURL *originalUrl; @property (nonatomic, strong)NSURL *originalUrl;
@property (nonatomic, copy)NSString *videoUrl; @property (nonatomic, copy)NSString *videoUrl;
@@ -16,7 +16,7 @@
@end @end
@implementation YXLookReportImageViewController @implementation XJDLookReportImageViewController
#pragma mark - LifeCycle #pragma mark - LifeCycle
@@ -1,5 +1,5 @@
// //
// YXQuestionDetailViewController.h // XJDQuestionDetailViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/27. // Created by 仁康信息 on 2023/4/27.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionDetailViewController : YXBaseViewController @interface XJDQuestionDetailViewController : YXBaseViewController
@property (nonatomic, copy) NSString * question_id; @property (nonatomic, copy) NSString * question_id;
@@ -1,23 +1,23 @@
// //
// YXQuestionDetailViewController.m // XJDQuestionDetailViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/4/27. // Created by on 2023/4/27.
// //
#import "YXQuestionDetailViewController.h" #import "XJDQuestionDetailViewController.h"
#import "DetailUserInfoView.h" #import "XJDDetailUserInfoView.h"
#import "DetailTitleView.h" #import "XJDDetailTitleView.h"
#import "QuestionAppointmentTimeView.h" #import "XJDQuestionAppointmentTimeView.h"
#import "QuestionFileDataView.h" #import "XJDQuestionFileDataView.h"
#import "QuestionHealthInfoView.h" #import "XJDQuestionHealthInfoView.h"
#import "QuestionReportView.h" #import "XJDQuestionReportView.h"
#import "YXRecoredListDetailModel.h" #import "XJDRecoredListDetailModel.h"
#import "YXQuestionBodyReportModel.h" #import "XJDQuestionBodyReportModel.h"
#import "RefuseQuestionPopView.h" #import "XJDRefuseQuestionPopView.h"
#import "YXCancelReasonModel.h" #import "XJDCancelReasonModel.h"
#import "YXFileDataDetailViewController.h" #import "XJDFileDataDetailViewController.h"
#import "YXDTTestView.h" #import "XJDTTestView.h"
#import "TUIConversationListBaseDataProvider.h" #import "TUIConversationListBaseDataProvider.h"
#import <ImSDK_Plus/ImSDK_Plus.h> #import <ImSDK_Plus/ImSDK_Plus.h>
@@ -25,21 +25,21 @@
#import <TUICore/TUICore.h> #import <TUICore/TUICore.h>
#import <TUICore/TUILogin.h> #import <TUICore/TUILogin.h>
#import "TUIConversationCellData.h" #import "TUIConversationCellData.h"
@interface YXQuestionDetailViewController ()<TUICallObserver> @interface XJDQuestionDetailViewController ()<TUICallObserver>
@property (nonatomic, strong) UIScrollView * mainScrollView; @property (nonatomic, strong) UIScrollView * mainScrollView;
@property (nonatomic, strong) DetailTitleView * titleview; @property (nonatomic, strong) XJDDetailTitleView * titleview;
@property (nonatomic, strong) DetailUserInfoView * infoView; @property (nonatomic, strong) XJDDetailUserInfoView * infoView;
@property (nonatomic, strong) QuestionAppointmentTimeView * timeView; @property (nonatomic, strong) XJDQuestionAppointmentTimeView * timeView;
@property (nonatomic, strong) QuestionFileDataView * fileView; @property (nonatomic, strong) XJDQuestionFileDataView * fileView;
@property (nonatomic, strong) QuestionReportView * reportView; @property (nonatomic, strong) XJDQuestionReportView * reportView;
@property (nonatomic, strong) QuestionHealthInfoView * healthView; @property (nonatomic, strong) XJDQuestionHealthInfoView * healthView;
@property (nonatomic, strong) UIView * questionStartView; @property (nonatomic, strong) UIView * questionStartView;
@@ -49,7 +49,7 @@
@property (nonatomic, strong) UIButton * sendVideBtn; @property (nonatomic, strong) UIButton * sendVideBtn;
@property (nonatomic, strong) RefuseQuestionPopView * popView; @property (nonatomic, strong) XJDRefuseQuestionPopView * popView;
@property (nonatomic, copy) NSString * conSession_id; @property (nonatomic, copy) NSString * conSession_id;
@@ -68,17 +68,17 @@
@property (nonatomic, copy) NSString * endPhoneID; @property (nonatomic, copy) NSString * endPhoneID;
@property (nonatomic, strong) YXRecoredDetailConsessionModel * timeModel; @property (nonatomic, strong) XJDRecoredDetailConsessionModel * timeModel;
@end @end
@implementation YXQuestionDetailViewController @implementation XJDQuestionDetailViewController
- (RefuseQuestionPopView *)popView { - (XJDRefuseQuestionPopView *)popView {
if (!_popView) { if (!_popView) {
MJWeakSelf MJWeakSelf
_popView = [[RefuseQuestionPopView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; _popView = [[XJDRefuseQuestionPopView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)];
_popView.upBlock = ^{ _popView.upBlock = ^{
}; };
@@ -121,23 +121,23 @@
self.mainScrollView.backgroundColor = KClearColor; self.mainScrollView.backgroundColor = KClearColor;
[self.view addSubview:self.mainScrollView]; [self.view addSubview:self.mainScrollView];
DetailTitleView * titleview = [[DetailTitleView alloc] initWithFrame:CGRectMake(0, 0, self.mainScrollView.width, 33)]; XJDDetailTitleView * titleview = [[XJDDetailTitleView alloc] initWithFrame:CGRectMake(0, 0, self.mainScrollView.width, 33)];
self.titleview = titleview; self.titleview = titleview;
[self.mainScrollView addSubview:titleview]; [self.mainScrollView addSubview:titleview];
// //
DetailUserInfoView * infoView = [[DetailUserInfoView alloc] initWithFrame:CGRectMake(0, titleview.bottom, kScreenWidth - kRealValue(30), kRealValue(103))]; XJDDetailUserInfoView * infoView = [[XJDDetailUserInfoView alloc] initWithFrame:CGRectMake(0, titleview.bottom, kScreenWidth - kRealValue(30), kRealValue(103))];
infoView.backgroundColor = KWhiteColor; infoView.backgroundColor = KWhiteColor;
self.infoView = infoView; self.infoView = infoView;
[self.mainScrollView addSubview:infoView]; [self.mainScrollView addSubview:infoView];
// //
QuestionAppointmentTimeView * timeView = [[QuestionAppointmentTimeView alloc] initWithFrame:CGRectMake(0, infoView.bottom + 1, kScreenWidth - kRealValue(30), kRealValue(64))]; XJDQuestionAppointmentTimeView * timeView = [[XJDQuestionAppointmentTimeView alloc] initWithFrame:CGRectMake(0, infoView.bottom + 1, kScreenWidth - kRealValue(30), kRealValue(64))];
timeView.backgroundColor = KWhiteColor; timeView.backgroundColor = KWhiteColor;
self.timeView = timeView; self.timeView = timeView;
[self.mainScrollView addSubview:timeView]; [self.mainScrollView addSubview:timeView];
// //
QuestionFileDataView * fileView = [[QuestionFileDataView alloc] initWithFrame:CGRectMake(0, timeView.bottom, kScreenWidth - kRealValue(30), kRealValue(64))]; XJDQuestionFileDataView * fileView = [[XJDQuestionFileDataView alloc] initWithFrame:CGRectMake(0, timeView.bottom, kScreenWidth - kRealValue(30), kRealValue(64))];
fileView.backgroundColor = KWhiteColor; fileView.backgroundColor = KWhiteColor;
fileView.height = fileView.fileHeight; fileView.height = fileView.fileHeight;
self.fileView = fileView; self.fileView = fileView;
@@ -146,13 +146,14 @@
}; };
[self.mainScrollView addSubview:fileView]; [self.mainScrollView addSubview:fileView];
// //
QuestionHealthInfoView * healthView = [[QuestionHealthInfoView alloc] initWithFrame:CGRectMake(0, fileView.bottom +1, kScreenWidth - kRealValue(30), kRealValue(1))]; XJDQuestionHealthInfoView * healthView = [[XJDQuestionHealthInfoView alloc] initWithFrame:CGRectMake(0, fileView.bottom +1, kScreenWidth - kRealValue(30), kRealValue(1))];
healthView.backgroundColor = KWhiteColor; healthView.backgroundColor = KWhiteColor;
self.healthView = healthView; self.healthView = healthView;
self.healthView.hidden = true;
self.questionStartView.layer.cornerRadius = 10.0; self.questionStartView.layer.cornerRadius = 10.0;
[self.mainScrollView addSubview:healthView]; [self.mainScrollView addSubview:healthView];
// //
QuestionReportView * reportView = [[QuestionReportView alloc] initWithFrame:CGRectMake(0, healthView.bottom +1, kScreenWidth - kRealValue(30), kRealValue(100))]; XJDQuestionReportView * reportView = [[XJDQuestionReportView alloc] initWithFrame:CGRectMake(0, healthView.bottom +1, kScreenWidth - kRealValue(30), kRealValue(100))];
reportView.backgroundColor = KWhiteColor; reportView.backgroundColor = KWhiteColor;
self.reportView = reportView; self.reportView = reportView;
self.reportView.layer.cornerRadius = 10.0; self.reportView.layer.cornerRadius = 10.0;
@@ -238,7 +239,7 @@
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:self.question_id forKey:@"id"]; [parmDic setObject:self.question_id forKey:@"id"];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"DeatilAPI" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"DeatilAPI" NeedToken:@""];
[detailApi GetRecoredQuestionDetail:parmDic]; [detailApi GetRecoredQuestionDetail:parmDic];
} }
@@ -247,7 +248,7 @@
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"REASOURAPI" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"REASOURAPI" NeedToken:@""];
[detailApi GetCancelReasourData:parmDic]; [detailApi GetCancelReasourData:parmDic];
@@ -269,13 +270,13 @@
[self hiddenAllMBProgressHUD]; [self hiddenAllMBProgressHUD];
NSDictionary * dic = response; NSDictionary * dic = response;
YXRecoredListDetailModel * model = [YXRecoredListDetailModel modelWithDictionary:dic]; XJDRecoredListDetailModel * model = [XJDRecoredListDetailModel modelWithDictionary:dic];
YXReocrdconFamilyMembersDO * infoModel = [YXReocrdconFamilyMembersDO modelWithDictionary:model.conFamilyMembersDO]; XJDReocrdconFamilyMembersDO * infoModel = [XJDReocrdconFamilyMembersDO modelWithDictionary:model.conFamilyMembersDO];
YXRecoredDetailConsessionModel * timeModel = [YXRecoredDetailConsessionModel modelWithDictionary:model.conSession]; XJDRecoredDetailConsessionModel * timeModel = [XJDRecoredDetailConsessionModel modelWithDictionary:model.conSession];
self.timeModel = timeModel; self.timeModel = timeModel;
YXRecoredconMedicalRecordsListDO * medicalModel = [YXRecoredconMedicalRecordsListDO modelWithDictionary:model.conMedicalRecordsListDO]; XJDRecoredconMedicalRecordsListDO * medicalModel = [XJDRecoredconMedicalRecordsListDO modelWithDictionary:model.conMedicalRecordsListDO];
//ID //ID
self.conSession_id = timeModel.consession_id; self.conSession_id = timeModel.consession_id;
self.record_id = medicalModel.dangan_id; self.record_id = medicalModel.dangan_id;
@@ -394,7 +395,7 @@
for (NSDictionary * reasourDic in array) { for (NSDictionary * reasourDic in array) {
YXCancelReasonModel * model = [YXCancelReasonModel modelWithDictionary:reasourDic]; XJDCancelReasonModel * model = [XJDCancelReasonModel modelWithDictionary:reasourDic];
[dataArray addObject:model]; [dataArray addObject:model];
@@ -426,11 +427,11 @@
NSDictionary * pamrDic = response; NSDictionary * pamrDic = response;
IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; XJDIMUserInfoModel * model = [XJDIMUserInfoModel modelWithDictionary:pamrDic];
IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; XJDIMUserInfoModel * iminfoModel = [[XJDIMUserInfoModel alloc] init];
iminfoModel.IMInfo = pamrDic; iminfoModel.IMInfo = pamrDic;
[HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo];
// 1. IM SDKAppID // 1. IM SDKAppID
// 2. config // 2. config
@@ -565,7 +566,7 @@
- (void)loginImAccount { - (void)loginImAccount {
YXNetAPI * proctocolApi = [[YXNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; XJDNetAPI * proctocolApi = [[XJDNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil];
[proctocolApi GetIMLoginAccount:nil]; [proctocolApi GetIMLoginAccount:nil];
@@ -585,7 +586,7 @@
[parmDic setObject:byID forKey:@"userId"]; [parmDic setObject:byID forKey:@"userId"];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"BodyApi" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"BodyApi" NeedToken:@""];
[detailApi getBodyReportDeatil:parmDic]; [detailApi getBodyReportDeatil:parmDic];
@@ -609,7 +610,7 @@
[self showMBProgressHUDWithString:@"视频通话请求中..." autoHidden:NO]; [self showMBProgressHUDWithString:@"视频通话请求中..." autoHidden:NO];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:self.question_id forKey:@"sessionId"]; [parmDic setObject:self.question_id forKey:@"sessionId"];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"STARSENDVIDE" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"STARSENDVIDE" NeedToken:@""];
[detailApi getSendVideoStart:parmDic]; [detailApi getSendVideoStart:parmDic];
} }
@@ -622,7 +623,7 @@
[parmDic setObject:rejectReason forKey:@"rejectReason"]; [parmDic setObject:rejectReason forKey:@"rejectReason"];
[parmDic setObject:reasonType forKey:@"reasonType"]; [parmDic setObject:reasonType forKey:@"reasonType"];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"SUBMITREASOUR" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"SUBMITREASOUR" NeedToken:@""];
[detailApi submitCancelreasourData:parmDic]; [detailApi submitCancelreasourData:parmDic];
@@ -630,7 +631,7 @@
// //
- (void)waitAcceptAction { - (void)waitAcceptAction {
YXDTTestView *vi = [[YXDTTestView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; XJDTTestView *vi = [[XJDTTestView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)];
[kAppWindow addSubview:vi]; [kAppWindow addSubview:vi];
vi.returnBlock = ^(NSString *startTime, NSString *endTime) { vi.returnBlock = ^(NSString *startTime, NSString *endTime) {
NSLog(@"开始时间 = %@", startTime); NSLog(@"开始时间 = %@", startTime);
@@ -640,7 +641,7 @@
[parmDic setObject:startTime forKey:@"startTime"]; [parmDic setObject:startTime forKey:@"startTime"];
[parmDic setObject:endTime forKey:@"endTime"]; [parmDic setObject:endTime forKey:@"endTime"];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"ACCEPTQUESTION" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"ACCEPTQUESTION" NeedToken:@""];
[detailApi getAcceptQuestion:parmDic]; [detailApi getAcceptQuestion:parmDic];
@@ -650,7 +651,7 @@
// //
-(void)againSendVideoTime { -(void)againSendVideoTime {
YXDTTestView *vi = [[YXDTTestView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)]; XJDTTestView *vi = [[XJDTTestView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight)];
[kAppWindow addSubview:vi]; [kAppWindow addSubview:vi];
vi.returnBlock = ^(NSString *startTime, NSString *endTime) { vi.returnBlock = ^(NSString *startTime, NSString *endTime) {
NSLog(@"开始时间 = %@", startTime); NSLog(@"开始时间 = %@", startTime);
@@ -661,7 +662,7 @@
[parmDic setObject:endTime forKey:@"endTime"]; [parmDic setObject:endTime forKey:@"endTime"];
[parmDic setObject:@(1) forKey:@"type"]; [parmDic setObject:@(1) forKey:@"type"];
[self showMBProgressHUDWithString:@"重新预约中" autoHidden:false]; [self showMBProgressHUDWithString:@"重新预约中" autoHidden:false];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"AgainQuestion" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"AgainQuestion" NeedToken:@""];
[detailApi getAgainSessionReservationDate:parmDic]; [detailApi getAgainSessionReservationDate:parmDic];
}; };
@@ -671,7 +672,7 @@
// //
- (void)lookFileDetail { - (void)lookFileDetail {
YXFileDataDetailViewController * detalVC = [[YXFileDataDetailViewController alloc] init]; XJDFileDataDetailViewController * detalVC = [[XJDFileDataDetailViewController alloc] init];
detalVC.record_id = self.record_id; detalVC.record_id = self.record_id;
[self.navigationController pushViewController:detalVC animated:YES]; [self.navigationController pushViewController:detalVC animated:YES];
@@ -685,7 +686,7 @@
[parmDic setObject:@"" forKey:@"startTime"]; [parmDic setObject:@"" forKey:@"startTime"];
[parmDic setObject:@"" forKey:@"endTime"]; [parmDic setObject:@"" forKey:@"endTime"];
[parmDic setObject:@(2) forKey:@"type"]; [parmDic setObject:@(2) forKey:@"type"];
YXNetAPI * detailApi = [[YXNetAPI alloc] init:self tag:@"beginVideo" NeedToken:@""]; XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"beginVideo" NeedToken:@""];
[detailApi getAgainSessionReservationDate:parmDic]; [detailApi getAgainSessionReservationDate:parmDic];
} }
@@ -695,7 +696,7 @@
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:self.endPhoneID forKey:@"id"]; [parmDic setObject:self.endPhoneID forKey:@"id"];
YXNetAPI * endApi = [[YXNetAPI alloc] init:self tag:@"ENDVideo" NeedToken:@""]; XJDNetAPI * endApi = [[XJDNetAPI alloc] init:self tag:@"ENDVideo" NeedToken:@""];
[endApi getendVideoReportById:parmDic]; [endApi getendVideoReportById:parmDic];
@@ -725,7 +726,7 @@
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:self.question_id forKey:@"id"]; [parmDic setObject:self.question_id forKey:@"id"];
YXNetAPI * endApi = [[YXNetAPI alloc] init:self tag:@"ENDPICTUREAPI" NeedToken:@""]; XJDNetAPI * endApi = [[XJDNetAPI alloc] init:self tag:@"ENDPICTUREAPI" NeedToken:@""];
[endApi GetEndPictureEndIMQuestion:parmDic]; [endApi GetEndPictureEndIMQuestion:parmDic];
} }
@@ -0,0 +1,19 @@
//
// XJDSickNameSubTableViewCell.h
// DoctorXinjiang
//
// Created by 仁康信息 on 2023/8/29.
//
#import <UIKit/UIKit.h>
#import "XJDHealthPhyReportModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface XJDSickNameSubTableViewCell : UITableViewCell
@property (nonatomic, strong) XJDThirdResultResModel * model;
@end
NS_ASSUME_NONNULL_END
@@ -1,14 +1,14 @@
// //
// YXSickNameSubTableViewCell.m // XJDSickNameSubTableViewCell.m
// EscortProject // DoctorXinjiang
// //
// Created by on 2023/8/29. // Created by on 2023/8/29.
// //
#import "YXSickNameSubTableViewCell.h" #import "XJDSickNameSubTableViewCell.h"
@interface YXSickNameSubTableViewCell () @interface XJDSickNameSubTableViewCell ()
@property (nonatomic, strong) UILabel * nameLabel; @property (nonatomic, strong) UILabel * nameLabel;
@property (nonatomic, strong) UILabel * resultLabel; @property (nonatomic, strong) UILabel * resultLabel;
@@ -18,7 +18,7 @@
@property (nonatomic, strong) UIView * popbackView; @property (nonatomic, strong) UIView * popbackView;
@end @end
@implementation YXSickNameSubTableViewCell @implementation XJDSickNameSubTableViewCell
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
@@ -119,7 +119,7 @@
[headView addSubview:lin_bottom]; [headView addSubview:lin_bottom];
} }
- (void)setModel:(YXThirdResultResModel *)model { - (void)setModel:(XJDThirdResultResModel *)model {
_model = model; _model = model;
@@ -189,7 +189,7 @@
connteLabel.textColor = CFontColor1; connteLabel.textColor = CFontColor1;
[centerView addSubview:connteLabel]; [centerView addSubview:connteLabel];
CGFloat h = [HQCommonUtils getSpaceLabelHeight:connteLabel AndLeftisTrue:true withStr:connteLabel.text withFont:[UIFont systemFontOfSize:14] withWidth:connteLabel.width withLineSpacing:5]; CGFloat h = [XJDCommonUtils getSpaceLabelHeight:connteLabel AndLeftisTrue:true withStr:connteLabel.text withFont:[UIFont systemFontOfSize:14] withWidth:connteLabel.width withLineSpacing:5];
connteLabel.height = h; connteLabel.height = h;
@@ -1,19 +1,19 @@
// //
// YXSickNameTopTableViewCell.h // XJDSickNameTopTableViewCell.h
// EscortProject // DoctorXinjiang
// //
// Created by 仁康信息 on 2023/8/29. // Created by 仁康信息 on 2023/8/29.
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "YXHealthPhyReportModel.h" #import "XJDHealthPhyReportModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
typedef void(^onekeyQuestionBlock)(NSString * itemID); typedef void(^onekeyQuestionBlock)(NSString * itemID);
@interface YXSickNameTopTableViewCell : UITableViewCell @interface XJDSickNameTopTableViewCell : UITableViewCell
@property (nonatomic, strong) YXThirdResultResModel * model; @property (nonatomic, strong) XJDThirdResultResModel * model;
@property (nonatomic, copy) onekeyQuestionBlock itemBlock; @property (nonatomic, copy) onekeyQuestionBlock itemBlock;
@property (nonatomic, copy) NSString * uniItemClassId; @property (nonatomic, copy) NSString * uniItemClassId;
@property (nonatomic, assign) NSInteger questionType; @property (nonatomic, assign) NSInteger questionType;
@@ -1,20 +1,20 @@
// //
// SickNameTopTableViewCell.m // SickNameTopTableViewCell.m
// EscortProject // DoctorXinjiang
// //
// Created by on 2023/8/29. // Created by on 2023/8/29.
// //
#import "YXSickNameTopTableViewCell.h" #import "XJDSickNameTopTableViewCell.h"
@interface YXSickNameTopTableViewCell () @interface XJDSickNameTopTableViewCell ()
@property (nonatomic, strong ) UILabel * sickNameLabel; @property (nonatomic, strong ) UILabel * sickNameLabel;
@property (nonatomic, strong ) YYLabel * oneKeyLabel; @property (nonatomic, strong ) YYLabel * oneKeyLabel;
@end @end
@implementation YXSickNameTopTableViewCell @implementation XJDSickNameTopTableViewCell
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
@@ -102,7 +102,7 @@
[headView addSubview:zhiLabel]; [headView addSubview:zhiLabel];
} }
- (void)setModel:(YXThirdResultResModel *)model { - (void)setModel:(XJDThirdResultResModel *)model {
_model = model; _model = model;
@@ -1,19 +1,19 @@
// //
// YXimageReportTableViewCell.h // XJDimageReportTableViewCell.h
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/2/23. // Created by Apple on 2024/2/23.
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "YXHealthPhyReportModel.h" #import "XJDHealthPhyReportModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
typedef void(^lookUserReport)(NSString * lookUrl); typedef void(^lookUserReport)(NSString * lookUrl);
@interface YXimageReportTableViewCell : UITableViewCell @interface XJDimageReportTableViewCell : UITableViewCell
@property (nonatomic, strong) YXImageItemListModel * model; @property (nonatomic, strong) XJDImageItemListModel * model;
@property (nonatomic, copy) lookUserReport lookBlock; @property (nonatomic, copy) lookUserReport lookBlock;
@@ -1,13 +1,13 @@
// //
// imageReportTableViewCell.m // imageReportTableViewCell.m
// EscortProject // DoctorXinjiang
// //
// Created by Apple on 2024/2/23. // Created by Apple on 2024/2/23.
// //
#import "YXimageReportTableViewCell.h" #import "XJDimageReportTableViewCell.h"
@interface YXimageReportTableViewCell () @interface XJDimageReportTableViewCell ()
@property (nonatomic, strong) UILabel * reportLabel; @property (nonatomic, strong) UILabel * reportLabel;
@@ -24,7 +24,7 @@
@end @end
@implementation YXimageReportTableViewCell @implementation XJDimageReportTableViewCell
- (NSMutableArray *)buttonArray { - (NSMutableArray *)buttonArray {
@@ -104,7 +104,7 @@
} }
- (void)setModel:(YXImageItemListModel *)model { - (void)setModel:(XJDImageItemListModel *)model {
_model = model; _model = model;
@@ -1,19 +0,0 @@
//
// YXSickNameSubTableViewCell.h
// EscortProject
//
// Created by 仁康信息 on 2023/8/29.
//
#import <UIKit/UIKit.h>
#import "YXHealthPhyReportModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface YXSickNameSubTableViewCell : UITableViewCell
@property (nonatomic, strong) YXThirdResultResModel * model;
@end
NS_ASSUME_NONNULL_END
@@ -1,5 +1,5 @@
// //
// YXAudioVideoRecordViewController.h // XJDAudioVideoRecordViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/28. // Created by 仁康信息 on 2023/4/28.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXAudioVideoRecordViewController : YXBaseViewController @interface XJDAudioVideoRecordViewController : YXBaseViewController
@property (nonatomic, assign) NSInteger questionType; @property (nonatomic, assign) NSInteger questionType;
@property (nonatomic, assign) NSInteger questionStatus; //待回复10 进行中20 已完成30 (时间充裕可优化枚举类型) @property (nonatomic, assign) NSInteger questionStatus; //待回复10 进行中20 已完成30 (时间充裕可优化枚举类型)
@@ -1,18 +1,18 @@
// //
// YXAudioVideoRecordViewController.m // XJDAudioVideoRecordViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/4/28. // Created by on 2023/4/28.
// //
#import "YXAudioVideoRecordViewController.h" #import "XJDAudioVideoRecordViewController.h"
#import "QuestionRecoredTable.h" #import "XJDQuestionRecoredTable.h"
#import "YXQuestionDetailViewController.h" #import "XJDQuestionDetailViewController.h"
#import "LYEmptyView.h" #import "LYEmptyView.h"
#import "LYEmptyViewHeader.h" #import "LYEmptyViewHeader.h"
@interface YXAudioVideoRecordViewController () @interface XJDAudioVideoRecordViewController ()
@property (nonatomic, strong) QuestionRecoredTable * homeTable; @property (nonatomic, strong) XJDQuestionRecoredTable * homeTable;
@property (nonatomic, strong) NSMutableArray * buttonArray; @property (nonatomic, strong) NSMutableArray * buttonArray;
@@ -24,7 +24,7 @@
@end @end
@implementation YXAudioVideoRecordViewController @implementation XJDAudioVideoRecordViewController
- (NSMutableArray *)dataArray { - (NSMutableArray *)dataArray {
@@ -60,7 +60,7 @@
- (void)createData { - (void)createData {
[self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:NO]; [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:NO];
YXNetAPI * listApi = [[YXNetAPI alloc] init:self tag:@"LIST" NeedToken:@""]; XJDNetAPI * listApi = [[XJDNetAPI alloc] init:self tag:@"LIST" NeedToken:@""];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@(self.pageNo) forKey:@"pageNo"];
@@ -103,11 +103,11 @@
self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(15) + 27 - SafetyAreaHeight - kRealValue(48)) style:UITableViewStyleGrouped]; self.homeTable = [[XJDQuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(15) + 27 - SafetyAreaHeight - kRealValue(48)) style:UITableViewStyleGrouped];
MJWeakSelf MJWeakSelf
self.homeTable.videoBlock = ^(YXRecordIMListDateModel * _Nonnull model) { self.homeTable.videoBlock = ^(XJDRecordIMListDateModel * _Nonnull model) {
YXQuestionDetailViewController * detailVC = [[YXQuestionDetailViewController alloc] init]; XJDQuestionDetailViewController * detailVC = [[XJDQuestionDetailViewController alloc] init];
detailVC.question_id = model.Record_id; detailVC.question_id = model.Record_id;
[weakSelf.navigationController pushViewController:detailVC animated:YES]; [weakSelf.navigationController pushViewController:detailVC animated:YES];
@@ -228,7 +228,7 @@
for (NSDictionary * dic in array) { for (NSDictionary * dic in array) {
YXRecordIMListDateModel * model = [YXRecordIMListDateModel modelWithDictionary:dic]; XJDRecordIMListDateModel * model = [XJDRecordIMListDateModel modelWithDictionary:dic];
[self.dataArray addObject:model]; [self.dataArray addObject:model];
} }
@@ -1,5 +1,5 @@
// //
// YXQustionRecordViewController.h // XJDPictureRecordViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/28. // Created by 仁康信息 on 2023/4/28.
@@ -9,8 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface XJDPictureRecordViewController : YXBaseViewController
@interface YXQustionRecordViewController : YXBaseViewController
@property (nonatomic, assign) NSInteger questionType; @property (nonatomic, assign) NSInteger questionType;
@property (nonatomic, assign) NSInteger questionStatus; //待回复10 进行中20 已完成30 (时间充裕可优化枚举类型) @property (nonatomic, assign) NSInteger questionStatus; //待回复10 进行中20 已完成30 (时间充裕可优化枚举类型)
@@ -1,14 +1,14 @@
// //
// YXPictureRecordViewController.m // XJDPictureRecordViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/4/28. // Created by on 2023/4/28.
// //
#import "YXPictureRecordViewController.h" #import "XJDPictureRecordViewController.h"
#import "QuestionRecoredTable.h" #import "XJDQuestionRecoredTable.h"
#import "YXQuestionRecordModel.h" #import "XJDQuestionRecordModel.h"
#import "YXRecordIMListDateModel.h" #import "XJDRecordIMListDateModel.h"
#import "ChatViewController.h" #import "ChatViewController.h"
#import "TUIConversationListBaseDataProvider.h" #import "TUIConversationListBaseDataProvider.h"
@@ -20,9 +20,9 @@
#import "TUIConversationCellData.h" #import "TUIConversationCellData.h"
#import "LYEmptyView.h" #import "LYEmptyView.h"
#import "LYEmptyViewHeader.h" #import "LYEmptyViewHeader.h"
@interface YXPictureRecordViewController ()<V2TIMSDKListener,V2TIMConversationListener> @interface XJDPictureRecordViewController ()<V2TIMSDKListener,V2TIMConversationListener>
@property (nonatomic, strong) QuestionRecoredTable * homeTable; @property (nonatomic, strong) XJDQuestionRecoredTable * homeTable;
@property (nonatomic, strong) NSMutableArray * buttonArray; @property (nonatomic, strong) NSMutableArray * buttonArray;
@@ -44,7 +44,7 @@
@end @end
@implementation YXPictureRecordViewController @implementation XJDPictureRecordViewController
- (NSMutableArray *)buttonArray { - (NSMutableArray *)buttonArray {
@@ -136,8 +136,8 @@
self.homeTable = [[QuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(15) + 27 - SafetyAreaHeight - kRealValue(48)) style:UITableViewStyleGrouped]; self.homeTable = [[XJDQuestionRecoredTable alloc] initWithFrame:CGRectMake(0, 50, kScreenWidth, kScreenHeight - kTopHeight - kRealValue(15) + 27 - SafetyAreaHeight - kRealValue(48)) style:UITableViewStyleGrouped];
self.homeTable.recordBlock = ^(YXRecordIMListDateModel * _Nonnull model) { self.homeTable.recordBlock = ^(XJDRecordIMListDateModel * _Nonnull model) {
if ([ESCTUIManager TUIUserStatus] == false) { if ([ESCTUIManager TUIUserStatus] == false) {
@@ -237,7 +237,7 @@
- (void)createData { - (void)createData {
[self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false];
YXNetAPI * listApi = [[YXNetAPI alloc] init:self tag:@"LIST" NeedToken:@""]; XJDNetAPI * listApi = [[XJDNetAPI alloc] init:self tag:@"LIST" NeedToken:@""];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@(self.pageNo) forKey:@"pageNo"];
@@ -307,7 +307,7 @@
[parmDic setObject:@"0" forKey:@"tfReply"]; [parmDic setObject:@"0" forKey:@"tfReply"];
[self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false];
YXNetAPI * recordApi = [[YXNetAPI alloc] init:self tag:@"GROUPID" NeedToken:@""]; XJDNetAPI * recordApi = [[XJDNetAPI alloc] init:self tag:@"GROUPID" NeedToken:@""];
[recordApi PostGroupIDArray:parmDic]; [recordApi PostGroupIDArray:parmDic];
} }
@@ -321,7 +321,7 @@
[parmDic setObject:@"1" forKey:@"tfReply"]; [parmDic setObject:@"1" forKey:@"tfReply"];
[self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false];
YXNetAPI * recordApi = [[YXNetAPI alloc] init:self tag:@"GROUPIDING" NeedToken:@""]; XJDNetAPI * recordApi = [[XJDNetAPI alloc] init:self tag:@"GROUPIDING" NeedToken:@""];
[recordApi PostGroupIDArray:parmDic]; [recordApi PostGroupIDArray:parmDic];
} }
@@ -404,7 +404,7 @@
for (NSDictionary * dic in array) { for (NSDictionary * dic in array) {
YXRecordIMListDateModel * model = [YXRecordIMListDateModel modelWithDictionary:dic]; XJDRecordIMListDateModel * model = [XJDRecordIMListDateModel modelWithDictionary:dic];
[self.dataArray addObject:model]; [self.dataArray addObject:model];
} }
@@ -416,11 +416,11 @@
[self hiddenAllMBProgressHUD]; [self hiddenAllMBProgressHUD];
NSDictionary * pamrDic = response; NSDictionary * pamrDic = response;
IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; XJDIMUserInfoModel * model = [XJDIMUserInfoModel modelWithDictionary:pamrDic];
IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; XJDIMUserInfoModel * iminfoModel = [[XJDIMUserInfoModel alloc] init];
iminfoModel.IMInfo = pamrDic; iminfoModel.IMInfo = pamrDic;
[HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo];
// 1. IM SDKAppID // 1. IM SDKAppID
// 2. config // 2. config
@@ -450,7 +450,7 @@
for (NSDictionary * parmDic in array) { for (NSDictionary * parmDic in array) {
YXRecordIMListDateModel * model = [ YXRecordIMListDateModel modelWithDictionary:parmDic]; XJDRecordIMListDateModel * model = [ XJDRecordIMListDateModel modelWithDictionary:parmDic];
for ( V2TIMConversation * v2Model in self.IMDataArray) { for ( V2TIMConversation * v2Model in self.IMDataArray) {
if ([model.imId isEqualToString:v2Model.groupID]) { if ([model.imId isEqualToString:v2Model.groupID]) {
DLog(@"------------%d",v2Model.unreadCount); DLog(@"------------%d",v2Model.unreadCount);
@@ -472,7 +472,7 @@
for (NSDictionary * parmDic in array) { for (NSDictionary * parmDic in array) {
YXRecordIMListDateModel * model = [ YXRecordIMListDateModel modelWithDictionary:parmDic]; XJDRecordIMListDateModel * model = [ XJDRecordIMListDateModel modelWithDictionary:parmDic];
for ( V2TIMConversation * v2Model in self.IMDataArray) { for ( V2TIMConversation * v2Model in self.IMDataArray) {
if ([model.imId isEqualToString:v2Model.groupID]) { if ([model.imId isEqualToString:v2Model.groupID]) {
DLog(@"------------%d",v2Model.unreadCount); DLog(@"------------%d",v2Model.unreadCount);
@@ -526,7 +526,7 @@
- (void)loginImAccount { - (void)loginImAccount {
YXNetAPI * proctocolApi = [[YXNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil]; XJDNetAPI * proctocolApi = [[XJDNetAPI alloc] init:self tag:@"IMAPI" NeedToken:nil];
[proctocolApi GetIMLoginAccount:nil]; [proctocolApi GetIMLoginAccount:nil];
@@ -1,5 +1,5 @@
// //
// YXPictureRecordViewController.h // XJDQustionRecordViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/28. // Created by 仁康信息 on 2023/4/28.
@@ -9,7 +9,8 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXPictureRecordViewController : YXBaseViewController
@interface XJDQustionRecordViewController : YXBaseViewController
@property (nonatomic, assign) NSInteger questionType; @property (nonatomic, assign) NSInteger questionType;
@property (nonatomic, assign) NSInteger questionStatus; //待回复10 进行中20 已完成30 (时间充裕可优化枚举类型) @property (nonatomic, assign) NSInteger questionStatus; //待回复10 进行中20 已完成30 (时间充裕可优化枚举类型)
@@ -5,11 +5,11 @@
// Created by on 2023/4/28. // Created by on 2023/4/28.
// //
#import "YXQustionRecordViewController.h" #import "XJDQustionRecordViewController.h"
#import "YXAudioVideoRecordViewController.h" #import "XJDAudioVideoRecordViewController.h"
#import "YXPictureRecordViewController.h" #import "XJDPictureRecordViewController.h"
@interface YXQustionRecordViewController ()<UICollectionViewDataSource,UICollectionViewDelegate> @interface XJDQustionRecordViewController ()<UICollectionViewDataSource,UICollectionViewDelegate>
/** 顶部控件*/ /** 顶部控件*/
@property (nonatomic, weak) UIScrollView *topView; @property (nonatomic, weak) UIScrollView *topView;
@@ -24,7 +24,7 @@
@end @end
@implementation YXQustionRecordViewController @implementation XJDQustionRecordViewController
#pragma mark - 懒加载 #pragma mark - 懒加载
- (NSMutableArray *)titleButtons { - (NSMutableArray *)titleButtons {
@@ -69,14 +69,14 @@
#pragma mark - 添加所有的子控制器 #pragma mark - 添加所有的子控制器
- (void)setupAllChildViewController { - (void)setupAllChildViewController {
//questionStatus //10 20 30 () //questionStatus //10 20 30 ()
YXPictureRecordViewController * pictureVc = [[YXPictureRecordViewController alloc] init]; XJDPictureRecordViewController * pictureVc = [[XJDPictureRecordViewController alloc] init];
pictureVc.view.backgroundColor = UIColorBackground; pictureVc.view.backgroundColor = UIColorBackground;
pictureVc.navigationItem.title = @"图文咨询"; pictureVc.navigationItem.title = @"图文咨询";
pictureVc.questionStatus = self.questionStatus; pictureVc.questionStatus = self.questionStatus;
[self addChildViewController:pictureVc]; [self addChildViewController:pictureVc];
// //
YXAudioVideoRecordViewController * videoVc = [[YXAudioVideoRecordViewController alloc] init]; XJDAudioVideoRecordViewController * videoVc = [[XJDAudioVideoRecordViewController alloc] init];
videoVc.view.backgroundColor = UIColorBackground; videoVc.view.backgroundColor = UIColorBackground;
videoVc.navigationItem.title = @"视频咨询"; videoVc.navigationItem.title = @"视频咨询";
videoVc.questionStatus = self.questionStatus; videoVc.questionStatus = self.questionStatus;
@@ -1,5 +1,5 @@
// //
// YXQuestionStatisticsViewController.h // XJDQuestionStatisticsViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/26. // Created by 仁康信息 on 2023/4/26.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionStatisticsViewController : YXBaseViewController @interface XJDQuestionStatisticsViewController : YXBaseViewController
@end @end
@@ -1,18 +1,18 @@
// //
// YXQuestionStatisticsViewController.m // XJDQuestionStatisticsViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/4/26. // Created by on 2023/4/26.
// //
#import "YXQuestionStatisticsViewController.h" #import "XJDQuestionStatisticsViewController.h"
#import "AAOptions.h" #import "AAOptions.h"
#import "AAChartView.h" #import "AAChartView.h"
#import "NSDate+Calendar.h" #import "NSDate+Calendar.h"
#import "BRDatePickerView.h" #import "BRDatePickerView.h"
#import "YXQuestionStaticsModel.h" #import "XJDQuestionStaticsModel.h"
#import "YXBillViewController.h" #import "XJDBillViewController.h"
@interface YXQuestionStatisticsViewController ()<AAChartViewEventDelegate> @interface XJDQuestionStatisticsViewController ()<AAChartViewEventDelegate>
@property (nonatomic, strong) AAChartView * aaChartView; @property (nonatomic, strong) AAChartView * aaChartView;
@@ -30,7 +30,7 @@
@end @end
@implementation YXQuestionStatisticsViewController @implementation XJDQuestionStatisticsViewController
- (NSMutableArray *)dataArray { - (NSMutableArray *)dataArray {
if(!_dataArray) { if(!_dataArray) {
@@ -391,7 +391,7 @@
- (void)createData { - (void)createData {
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"QUSTIONAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"QUSTIONAPI" NeedToken:@""];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject: self.quesDate forKey:@"date"]; [parmDic setObject: self.quesDate forKey:@"date"];
[workApi GetQuestionStatistics:parmDic]; [workApi GetQuestionStatistics:parmDic];
@@ -400,7 +400,7 @@
- (void)createEarmingsData { - (void)createEarmingsData {
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"EARNINGAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"EARNINGAPI" NeedToken:@""];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[workApi GetStatisticsEarnings:parmDic]; [workApi GetStatisticsEarnings:parmDic];
@@ -423,14 +423,14 @@
[self.dataArray removeAllObjects]; [self.dataArray removeAllObjects];
for (NSDictionary * dic in array) { for (NSDictionary * dic in array) {
YXQuestionStaticsModel * model = [YXQuestionStaticsModel modelWithDictionary:dic]; XJDQuestionStaticsModel * model = [XJDQuestionStaticsModel modelWithDictionary:dic];
[self.dataArray addObject:model]; [self.dataArray addObject:model];
} }
NSInteger pictureNum; NSInteger pictureNum;
NSInteger videoNum; NSInteger videoNum;
NSInteger allNumber; NSInteger allNumber;
YXQuestionStaticsModel * picmodel; XJDQuestionStaticsModel * picmodel;
YXQuestionStaticsModel * videomodel; XJDQuestionStaticsModel * videomodel;
if (self.dataArray.count>=2) { if (self.dataArray.count>=2) {
picmodel = self.dataArray[0]; picmodel = self.dataArray[0];
pictureNum = [picmodel.total integerValue]; pictureNum = [picmodel.total integerValue];
@@ -497,7 +497,7 @@
// //
- (void)handleTapGesture:(id)sender { - (void)handleTapGesture:(id)sender {
YXBillViewController * billVC = [[YXBillViewController alloc] init]; XJDBillViewController * billVC = [[XJDBillViewController alloc] init];
[self.navigationController pushViewController:billVC animated:YES]; [self.navigationController pushViewController:billVC animated:YES];
@@ -1,16 +0,0 @@
//
// YXStopAnnouncementViewController.h
// healthQuestion
//
// Created by 仁康信息 on 2023/5/5.
//
#import "HQBaseViewController.h"
NS_ASSUME_NONNULL_BEGIN
@interface YXStopAnnouncementViewController : HQBaseViewController
@end
NS_ASSUME_NONNULL_END
@@ -1,5 +1,5 @@
// //
// YXStopAnnouncementViewController.h // XJDStopAnnouncementViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/5/5. // Created by 仁康信息 on 2023/5/5.
@@ -8,7 +8,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXStopAnnouncementViewController : YXBaseViewController @interface XJDStopAnnouncementViewController : YXBaseViewController
@end @end
@@ -5,15 +5,15 @@
// Created by on 2023/5/5. // Created by on 2023/5/5.
// //
#import "YXStopAnnouncementViewController.h" #import "XJDStopAnnouncementViewController.h"
#import "ZHTagListView.h" #import "ZHTagListView.h"
#import "BRDatePickerView.h" #import "BRDatePickerView.h"
#import "NSDate+Calendar.h" #import "NSDate+Calendar.h"
#import "UIPlaceHolderTextView.h" #import "UIPlaceHolderTextView.h"
#import "YXStopReasonModel.h" #import "XJDStopReasonModel.h"
#import "StopQuestionPopView.h" #import "XJDStopQuestionPopView.h"
@interface YXStopAnnouncementViewController () @interface XJDStopAnnouncementViewController ()
@property (nonatomic, strong) UIView * announceView; @property (nonatomic, strong) UIView * announceView;
@@ -40,7 +40,7 @@
@end @end
@implementation YXStopAnnouncementViewController @implementation XJDStopAnnouncementViewController
- (NSMutableArray *)reasonArray { - (NSMutableArray *)reasonArray {
@@ -187,7 +187,7 @@
- (void)getReasonData { - (void)getReasonData {
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"ReasonAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"ReasonAPI" NeedToken:@""];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:@"doctor_stop_reason_type" forKey:@"dictKey"]; [parmDic setObject:@"doctor_stop_reason_type" forKey:@"dictKey"];
[workApi GetPublishServerReason:parmDic]; [workApi GetPublishServerReason:parmDic];
@@ -267,7 +267,7 @@
[parmDic setObject:starString forKey:@"startTime"]; [parmDic setObject:starString forKey:@"startTime"];
[parmDic setObject:endString forKey:@"endTime"]; [parmDic setObject:endString forKey:@"endTime"];
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"CURRENTAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"CURRENTAPI" NeedToken:@""];
[workApi GetCurrentServerNumber:parmDic]; [workApi GetCurrentServerNumber:parmDic];
// //
@@ -305,7 +305,7 @@
[parmDic setObject:starDateStr forKey:@"startDay"]; [parmDic setObject:starDateStr forKey:@"startDay"];
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"ADDAPI" NeedToken:@""];
[workApi PostStopPublishServer:parmDic]; [workApi PostStopPublishServer:parmDic];
@@ -327,7 +327,7 @@
NSMutableArray * textArray = [[NSMutableArray alloc] init]; NSMutableArray * textArray = [[NSMutableArray alloc] init];
for (NSDictionary * resDic in resArray) { for (NSDictionary * resDic in resArray) {
YXStopReasonModel * model = [YXStopReasonModel modelWithDictionary:resDic]; XJDStopReasonModel * model = [XJDStopReasonModel modelWithDictionary:resDic];
[textArray addObject:model.text]; [textArray addObject:model.text];
[self.reasonArray addObject:model]; [self.reasonArray addObject:model];
} }
@@ -354,7 +354,7 @@
// }else // }else
// { // {
// //
// StopQuestionPopView * popview = [[StopQuestionPopView alloc] initWithFrame:[UIScreen mainScreen].bounds]; // XJDStopQuestionPopView * popview = [[XJDStopQuestionPopView alloc] initWithFrame:[UIScreen mainScreen].bounds];
// popview.questionNumber = resString; // popview.questionNumber = resString;
// popview.publisBlock = ^{ // popview.publisBlock = ^{
// [self addPublishDate]; // [self addPublishDate];
@@ -1,5 +1,5 @@
// //
// YXStopQuestionCauseViewController.h // XJDStopQuestionCauseViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/30. // Created by 仁康信息 on 2023/4/30.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXStopQuestionCauseViewController : YXBaseViewController @interface XJDStopQuestionCauseViewController : YXBaseViewController
@end @end
@@ -1,17 +1,17 @@
// //
// YXStopQuestionCauseViewController.m // XJDStopQuestionCauseViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/4/30. // Created by on 2023/4/30.
// //
#import "YXStopQuestionCauseViewController.h" #import "XJDStopQuestionCauseViewController.h"
@interface YXStopQuestionCauseViewController () @interface XJDStopQuestionCauseViewController ()
@end @end
@implementation YXStopQuestionCauseViewController @implementation XJDStopQuestionCauseViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
@@ -1,5 +1,5 @@
// //
// YXStopQuestionSettingVC.h // XJDStopQuestionSettingVC.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/4/29. // Created by 仁康信息 on 2023/4/29.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXStopQuestionSettingVC : YXBaseViewController @interface XJDStopQuestionSettingVC : YXBaseViewController
@end @end
@@ -1,18 +1,18 @@
// //
// YXStopQuestionSettingVC.m // XJDStopQuestionSettingVC.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/4/29. // Created by on 2023/4/29.
// //
#import "YXStopQuestionSettingVC.h" #import "XJDStopQuestionSettingVC.h"
#import "StopQuestionTableView.h" #import "XJDStopQuestionTableView.h"
#import "StopQuestionPopView.h" #import "XJDStopQuestionPopView.h"
#import "YXStopServiceModel.h" #import "XJDStopServiceModel.h"
#import "YXStopAnnouncementViewController.h" #import "XJDStopAnnouncementViewController.h"
@interface YXStopQuestionSettingVC () @interface XJDStopQuestionSettingVC ()
@property (nonatomic, strong) StopQuestionTableView * homeTable; @property (nonatomic, strong) XJDStopQuestionTableView * homeTable;
@property (nonatomic, strong) NSMutableArray * dataArray; @property (nonatomic, strong) NSMutableArray * dataArray;
@@ -22,7 +22,7 @@
@end @end
@implementation YXStopQuestionSettingVC @implementation XJDStopQuestionSettingVC
- (NSMutableArray *)dataArray { - (NSMutableArray *)dataArray {
@@ -39,7 +39,7 @@
self.isHidenNaviBar = false; self.isHidenNaviBar = false;
self.view.backgroundColor = UIColorHex(#EFEFEF); self.view.backgroundColor = UIColorHex(#EFEFEF);
self.navigationItem.title = @"暂停服务"; self.navigationItem.title = @"暂停服务";
self.pageNo = 0; self.pageNo =1;
self.pageSize = 10; self.pageSize = 10;
[self createUI]; [self createUI];
[self createData]; [self createData];
@@ -71,7 +71,7 @@
make.centerX.mas_equalTo(self.view); make.centerX.mas_equalTo(self.view);
}]; }];
self.homeTable = [[StopQuestionTableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; self.homeTable = [[XJDStopQuestionTableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
self.homeTable.changeBlock = ^(NSString * _Nullable record_id) { self.homeTable.changeBlock = ^(NSString * _Nullable record_id) {
DLog(@"%@",record_id); DLog(@"%@",record_id);
[self chageServiceStatus:record_id]; [self chageServiceStatus:record_id];
@@ -106,7 +106,7 @@
YXStopAnnouncementViewController * publishVC = [[YXStopAnnouncementViewController alloc] init]; XJDStopAnnouncementViewController * publishVC = [[XJDStopAnnouncementViewController alloc] init];
[self.navigationController pushViewController:publishVC animated:YES]; [self.navigationController pushViewController:publishVC animated:YES];
} }
@@ -119,7 +119,7 @@
[parmDic setObject:@(self.pageNo) forKey:@"pageNo"]; [parmDic setObject:@(self.pageNo) forKey:@"pageNo"];
[parmDic setObject:@(self.pageSize) forKey:@"pageSize"]; [parmDic setObject:@(self.pageSize) forKey:@"pageSize"];
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"RECORDAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"RECORDAPI" NeedToken:@""];
[workApi GetSPublishServerRecored:parmDic]; [workApi GetSPublishServerRecored:parmDic];
@@ -132,7 +132,7 @@
[parmDic setObject:recordID forKey:@"id"]; [parmDic setObject:recordID forKey:@"id"];
[parmDic setObject:@"1" forKey:@"serviceStatus"]; [parmDic setObject:@"1" forKey:@"serviceStatus"];
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"CHAGEAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"CHAGEAPI" NeedToken:@""];
[workApi GetChangePublishServer:parmDic]; [workApi GetChangePublishServer:parmDic];
} }
@@ -157,9 +157,9 @@
[self.dataArray removeAllObjects]; [self.dataArray removeAllObjects];
} }
YXStopServiceModel * model = [YXStopServiceModel modelWithDictionary:resDic]; XJDStopServiceModel * model = [XJDStopServiceModel modelWithDictionary:resDic];
for (YXStopServiceListModel * listModel in model.records ) { for (XJDStopServiceListModel * listModel in model.records ) {
[self.dataArray addObject:listModel]; [self.dataArray addObject:listModel];
} }
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXBasicHealthInfoViewController : YXBaseViewController @interface XJDBasicHealthInfoViewController : YXBaseViewController
@end @end
@@ -5,17 +5,17 @@
// Created by on 2023/5/4. // Created by on 2023/5/4.
// //
#import "YXBasicHealthInfoViewController.h" #import "XJDBasicHealthInfoViewController.h"
#import "BasicHealthInfoView.h" #import "XJDBasicHealthInfoView.h"
@interface YXBasicHealthInfoViewController () @interface XJDBasicHealthInfoViewController ()
@end @end
@implementation YXBasicHealthInfoViewController @implementation XJDBasicHealthInfoViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
@@ -28,7 +28,7 @@
- (void)createUI { - (void)createUI {
BasicHealthInfoView * infoView = [[BasicHealthInfoView alloc] initWithFrame:CGRectMake(kRealValue(15), kRealValue(15), kScreenWidth - kRealValue(30), kRealValue(286))]; XJDBasicHealthInfoView * infoView = [[XJDBasicHealthInfoView alloc] initWithFrame:CGRectMake(kRealValue(15), kRealValue(15), kScreenWidth - kRealValue(30), kRealValue(286))];
infoView.backgroundColor = [UIColor whiteColor]; infoView.backgroundColor = [UIColor whiteColor];
infoView.layer.cornerRadius = 10.0; infoView.layer.cornerRadius = 10.0;
infoView.layer.masksToBounds = true; infoView.layer.masksToBounds = true;
@@ -1,5 +1,5 @@
// //
// YXHomePageViewController.h // XJDHomePageViewController.h
// healthQuestion // healthQuestion
// //
// Created by xulei on 2022/8/17. // Created by xulei on 2022/8/17.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXHomePageViewController : YXBaseViewController @interface XJDHomePageViewController : YXBaseViewController
@@ -1,30 +1,35 @@
// //
// YXHomePageViewController.m // XJDHomePageViewController.m
// healthQuestion // healthQuestion
// //
// Created by xulei on 2022/8/17. // Created by xulei on 2022/8/17.
// //
#import "YXHomePageViewController.h" #import "XJDHomePageViewController.h"
#import "YXQuestionDetailViewController.h" #import "XJDQuestionDetailViewController.h"
#import "YXHomePageModel.h" #import "XJDHomePageModel.h"
#import "ChatViewController.h" #import "ChatViewController.h"
#import "MJRefresh.h" #import "MJRefresh.h"
#import "HQShowPromptPopView.h" #import "XJDShowPromptPopView.h"
#import "YXQuestionStatisticsViewController.h" #import "XJDQuestionStatisticsViewController.h"
#import "YXQustionRecordViewController.h" #import "XJDQustionRecordViewController.h"
#import "YXStopQuestionSettingVC.h" #import "XJDStopQuestionSettingVC.h"
#import "YXBasicHealthInfoViewController.h" #import "XJDBasicHealthInfoViewController.h"
#import "RefuseQuestionPopView.h" #import "XJDRefuseQuestionPopView.h"
#import "YXHistoricalRecordViewController.h" #import "XJDHistoricalRecordViewController.h"
#import "YXFileDataDetailViewController.h" #import "XJDFileDataDetailViewController.h"
#import "YXStopAnnouncementViewController.h" #import "XJDStopAnnouncementViewController.h"
#import "YXBillDetailViewController.h" #import "XJDBillDetailViewController.h"
#import "TUIC2CChatViewController.h" #import "TUIC2CChatViewController.h"
#import "YXDoctorInfoModel.h" #import "XJDDoctorInfoModel.h"
#import "PSAppInfo.h" #import "PSAppInfo.h"
#import "PSCheckVersion.h" #import "PSCheckVersion.h"
@interface YXHomePageViewController ()<V2TIMSimpleMsgListener,V2TIMSDKListener,TUIMessageCellDelegate,TUIBaseMessageControllerDelegate,TUICallObserver> #import "UPAppVesionModel.h"
#import "PSCheckVersionView.h"
#import "XJParticipatedOrderModel.h"
@interface XJDHomePageViewController ()<V2TIMSimpleMsgListener,V2TIMSDKListener,TUIMessageCellDelegate,TUIBaseMessageControllerDelegate,TUICallObserver,UITableViewDelegate,UITableViewDataSource>
@property (nonatomic, strong) UIScrollView * mainScrollView; @property (nonatomic, strong) UIScrollView * mainScrollView;
@@ -37,11 +42,32 @@
@property (nonatomic, strong) UIImageView * heardImage; @property (nonatomic, strong) UIImageView * heardImage;
@property (nonatomic, strong) UILabel * messageLabel; @property (nonatomic, strong) UILabel * messageLabel;
@property (nonatomic, copy) NSString * smallGroup; @property (nonatomic, copy) NSString * smallGroup;
@property (nonatomic, strong) PSCheckVersionView * checkVersionView;
@property (nonatomic, strong) UIView * coverView;
@property (nonatomic, strong) NSMutableArray<XJParticipatedOrderModel *> *orderList;
@property (nonatomic, assign) NSInteger orderPage;
@property (nonatomic, strong) UITableView *orderPopupTable;
@property (nonatomic, assign) NSInteger selectedOrderIndex;
@end @end
@implementation YXHomePageViewController @implementation XJDHomePageViewController
- (UIView *)coverView {
if (!_coverView) {
_coverView = [[UIView alloc] initWithFrame:[UIScreen mainScreen].bounds];
_coverView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5f];
}
return _coverView;
}
- (void)viewDidLoad { - (void)viewDidLoad {
@@ -54,7 +80,6 @@
object:nil]; object:nil];
// //
[self chageUrlService];
[[V2TIMManager sharedInstance] addSimpleMsgListener:self]; [[V2TIMManager sharedInstance] addSimpleMsgListener:self];
[[TUICallEngine createInstance] addObserver:self]; [[TUICallEngine createInstance] addObserver:self];
@@ -62,10 +87,9 @@
self.StatusBarStyle = UIStatusBarStyleDefault; self.StatusBarStyle = UIStatusBarStyleDefault;
self.view.backgroundColor = CViewBgColor; self.view.backgroundColor = CViewBgColor;
self.navigationItem.title = @"健康专家库"; self.navigationItem.title = @"健康专家库";
[self getUpDateinfo];
[self docotrUserInfo]; [self docotrUserInfo];
[self creatSmallHelpNumber]; [self creatSmallHelpNumber];
[PSCheckVersion checkVersionCompulsoryUpdate];
} }
@@ -76,84 +100,12 @@
} }
#pragma mark:请求前缀
- (void)chageUrlService {
AFHTTPSessionManager *session=[AFHTTPSessionManager manager];
// AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
session.responseSerializer.acceptableContentTypes=[NSSet setWithObjects:@"application/json",@"text/json",@"text/javascript",@"text/html",@"text/plain", nil];
//
session.requestSerializer.timeoutInterval= 30.f;
session.responseSerializer = [AFHTTPResponseSerializer serializer];
session.requestSerializer = [AFJSONRequestSerializer serializer];
session.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
//
NSString * version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
// .
NSArray * components = [version componentsSeparatedByString:@"."];
//
NSString * lastComponent = [components lastObject];
//
NSInteger lastNumber = [lastComponent integerValue];
[parmDic setObject:@(lastNumber) forKey:@"version"];
[parmDic setObject:@"health.Employees.tools" forKey:@"pkg"];
[session GET:@"https://base.icdat.cn/v2/url" parameters:parmDic headers:nil progress:^(NSProgress * _Nonnull downloadProgress) {
} success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
NSString * dataString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
DLog(@"response\n%@\n",dataString);
NSData *requestData = [dataString dataUsingEncoding:NSUTF8StringEncoding];
id myResult = [NSJSONSerialization JSONObjectWithData:requestData options:NSJSONReadingMutableContainers error:nil];
//
if ([myResult isKindOfClass:[NSDictionary class]]) {
NSDictionary *response = (NSDictionary *)myResult;
if ([response.allKeys containsObject:@"result"]) {
NSDictionary * resultDic = [response objectForKey:@"result"];
if ([resultDic.allKeys containsObject:@"api"]) {
[[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"api"] forKey:@"HTTPS"];
[[NSUserDefaults standardUserDefaults] synchronize];
}
if ([resultDic.allKeys containsObject:@"h5"]) {
[[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"h5"] forKey:@"IntervenH5"];
[[NSUserDefaults standardUserDefaults] synchronize];
}
if ([resultDic.allKeys containsObject:@"h5Host"]) {
[[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"h5Host"] forKey:@"H5DevHost"];
[[NSUserDefaults standardUserDefaults] synchronize];
}
if ([resultDic.allKeys containsObject:@"health"]) {
[[NSUserDefaults standardUserDefaults] setObject:[resultDic objectForKey:@"health"] forKey:@"BASEURL"];
[[NSUserDefaults standardUserDefaults] synchronize];
}
}
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
NSString * statusCode = [error.userInfo objectForKey:@"NSLocalizedDescription"];
}];
}
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
[self.mainScrollView.mj_header beginRefreshing]; // TODO:
// [self.mainScrollView.mj_header beginRefreshing];
} }
- (void)createUI { - (void)createUI {
@@ -164,7 +116,7 @@
UIView * linV = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 0.5)]; UIView * linV = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 0.5)];
[self.mainScrollView addSubview:linV]; [self.mainScrollView addSubview:linV];
YXUserInfo * user = [HQCommonUtils keyedUnarchiverWithKey:LoginUserInfo]; XJDUserInfo * user = [XJDCommonUtils keyedUnarchiverWithKey:LoginUserInfo];
UIView * topBack = [[UIView alloc] initWithFrame:CGRectMake(0, linV.bottom, kScreenWidth, kRealValue(130))]; UIView * topBack = [[UIView alloc] initWithFrame:CGRectMake(0, linV.bottom, kScreenWidth, kRealValue(130))];
topBack.backgroundColor = UIColorHex(#21BEBD); topBack.backgroundColor = UIColorHex(#21BEBD);
@@ -174,7 +126,7 @@
self.nameLabel.textColor = KWhiteColor; self.nameLabel.textColor = KWhiteColor;
self.nameLabel.font = SYSTEMFONT(21); self.nameLabel.font = SYSTEMFONT(21);
self.nameLabel.text = user.realname; self.nameLabel.text = user.realname;
CGFloat w = [HQCommonUtils getLengthFromText:self.nameLabel.text andFontSize:21]; CGFloat w = [XJDCommonUtils getLengthFromText:self.nameLabel.text andFontSize:21];
self.nameLabel.width = w; self.nameLabel.width = w;
self.nameLabel.textAlignment = NSTextAlignmentLeft; self.nameLabel.textAlignment = NSTextAlignmentLeft;
[topBack addSubview:self.nameLabel]; [topBack addSubview:self.nameLabel];
@@ -203,7 +155,7 @@
// UIView * questionView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), self.heardImage.bottom + kRealValue(23), kScreenWidth - kRealValue(30), kRealValue(132) * 2 + kRealValue(10))]; // UIView * questionView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), self.heardImage.bottom + kRealValue(23), kScreenWidth - kRealValue(30), kRealValue(132) * 2 + kRealValue(10))];
// questionView.backgroundColor = KRedColor; // questionView.backgroundColor = KRedColor;
// questionView.layer.cornerRadius = 10.0; // questionView.layer.cornerRadius = 10.0;
//// [HQCommonUtils addShadowToView:questionView]; //// [XJDCommonUtils addShadowToView:questionView];
// [self.view addSubview:questionView]; // [self.view addSubview:questionView];
NSArray * array = @[@[@"图文咨询",@"通过图片、文字的形式进行咨询"],@[@"视频咨询",@"通过语音视频电话的形式进行咨询"]]; NSArray * array = @[@[@"图文咨询",@"通过图片、文字的形式进行咨询"],@[@"视频咨询",@"通过语音视频电话的形式进行咨询"]];
@@ -242,14 +194,14 @@
UILabel * titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(leftImg.right + kRealValue(15), kRealValue(28), kScreenWidth - kRealValue(65), 14)]; UILabel * titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(leftImg.right + kRealValue(15), kRealValue(28), kScreenWidth - kRealValue(65), 14)];
titleLabel.textColor = UIColorHex(#333333); titleLabel.textColor = UIColorHex(#333333);
titleLabel.font = BOLDSYSTEMFONT(14); titleLabel.font = BOLDSYSTEMFONT(14);
titleLabel.text = @"小助手"; titleLabel.text = @"全科医生";
titleLabel.textAlignment = NSTextAlignmentLeft; titleLabel.textAlignment = NSTextAlignmentLeft;
[smallView addSubview:titleLabel]; [smallView addSubview:titleLabel];
UILabel * desLabel = [[UILabel alloc] initWithFrame:CGRectMake(leftImg.right + kRealValue(15), titleLabel.bottom + kRealValue(10), kScreenWidth - kRealValue(65), 11)]; UILabel * desLabel = [[UILabel alloc] initWithFrame:CGRectMake(leftImg.right + kRealValue(15), titleLabel.bottom + kRealValue(10), kScreenWidth - kRealValue(65), 11)];
desLabel.textColor = UIColorHex(#666666); desLabel.textColor = UIColorHex(#666666);
desLabel.font = SYSTEMFONT(11); desLabel.font = SYSTEMFONT(11);
desLabel.text = @"联系小助手获取相关帮助和支持"; desLabel.text = @"联系全科医生获取相关帮助和支持";
desLabel.textAlignment = NSTextAlignmentLeft; desLabel.textAlignment = NSTextAlignmentLeft;
[smallView addSubview:desLabel]; [smallView addSubview:desLabel];
@@ -271,6 +223,41 @@
// messageLabel.backgroundColor = UIColorHex(#21BEBD); // messageLabel.backgroundColor = UIColorHex(#21BEBD);
// [smallView addSubview:messageLabel]; // [smallView addSubview:messageLabel];
//
UIView * sosView = [[UIView alloc] initWithFrame:CGRectMake(kRealValue(15), smallView.bottom + kRealValue(10), kScreenWidth - kRealValue(30), 90)];
sosView.backgroundColor = KWhiteColor;
sosView.layer.cornerRadius = 10.0;
sosView.layer.masksToBounds = YES;
UITapGestureRecognizer *sosTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(sosEmergencyAction)];
[sosView addGestureRecognizer:sosTap];
[self.mainScrollView addSubview:sosView];
// 40x40
UIImageView * sosIcon = [[UIImageView alloc] initWithFrame:CGRectMake(20, (90 - 40) / 2, 40, 40)];
sosIcon.image = [UIImage imageNamed:@"home_sos_icon"];
sosIcon.layer.cornerRadius = 20;
sosIcon.layer.masksToBounds = YES;
sosIcon.backgroundColor = UIColorHex(#21BEBD);
[sosView addSubview:sosIcon];
//
UILabel * sosTitle = [[UILabel alloc] initWithFrame:CGRectMake(sosIcon.right + 12, (90 - 14 - 6 - 12) / 2, sosView.width - sosIcon.right - 32, 14)];
sosTitle.text = @"员工应急求助";
sosTitle.textColor = UIColorHex(#262626);
sosTitle.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
[sosView addSubview:sosTitle];
//
UILabel * sosSubTitle = [[UILabel alloc] initWithFrame:CGRectMake(sosIcon.right + 12, sosTitle.bottom + 10, sosView.width - sosIcon.right - 32, 12)];
sosSubTitle.text = @"专家视频连线,守护员工健康";
sosSubTitle.textColor = UIColorHex(#6A6A6A);
sosSubTitle.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
[sosView addSubview:sosSubTitle];
// scrollView
self.mainScrollView.contentSize = CGSizeMake(kScreenWidth, sosView.bottom + 30);
MJWeakSelf MJWeakSelf
self.mainScrollView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ self.mainScrollView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
// block // block
@@ -289,7 +276,7 @@
- (void)createMessageNumber { - (void)createMessageNumber {
YXNetAPI * homeApi = [[YXNetAPI alloc] init:self tag:@"HOMEAPI" NeedToken:@""]; XJDNetAPI * homeApi = [[XJDNetAPI alloc] init:self tag:@"HOMEAPI" NeedToken:@""];
[homeApi getHomeData:nil]; [homeApi getHomeData:nil];
@@ -297,7 +284,7 @@
- (void)docotrUserInfo { - (void)docotrUserInfo {
YXNetAPI * homeApi = [[YXNetAPI alloc] init:self tag:@"DoctorINFO" NeedToken:@""]; XJDNetAPI * homeApi = [[XJDNetAPI alloc] init:self tag:@"DoctorINFO" NeedToken:@""];
[homeApi GetInquireDoctorInfo:nil]; [homeApi GetInquireDoctorInfo:nil];
@@ -311,15 +298,30 @@
[self loginImAccount]; [self loginImAccount];
} }
[self showMBProgressHUDWithString:@"加载中..." autoHidden:false]; [self showMBProgressHUDWithString:@"加载中..." autoHidden:false];
YXNetAPI * homeApi = [[YXNetAPI alloc] init:self tag:@"FOUNDSMALLAPI" NeedToken:@""]; XJDNetAPI * homeApi = [[XJDNetAPI alloc] init:self tag:@"FOUNDSMALLAPI" NeedToken:@""];
[homeApi getHomeFoundSmallHelpData:nil]; [homeApi getHomeFoundSmallHelpData:nil];
} }
#pragma mark:更新
- (void)getUpDateinfo {
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
//
[parmDic setObject:@"com.questionTools.DoctorXinjiang" forKey:@"packageName"];
[parmDic setObject:@"2" forKey:@"androidOrIos"];
XJDNetAPI * homeRemakerApi = [[XJDNetAPI alloc] init:self tag:@"UPVERSION" NeedToken:@""];
[homeRemakerApi GetAppVesionUpdata:parmDic];
}
- (void)creatSmallHelpNumber { - (void)creatSmallHelpNumber {
YXNetAPI * homeApi = [[YXNetAPI alloc] init:self tag:@"SMALLAPI" NeedToken:@""]; XJDNetAPI * homeApi = [[XJDNetAPI alloc] init:self tag:@"SMALLAPI" NeedToken:@""];
[homeApi getHomeSmallData:nil]; [homeApi getHomeSmallData:nil];
@@ -435,7 +437,7 @@
NSDictionary * responDic = response; NSDictionary * responDic = response;
YXZJSmallHelpModel * helpModel = [YXZJSmallHelpModel modelWithDictionary:responDic]; XJDSmallHelpModel * helpModel = [XJDSmallHelpModel modelWithDictionary:responDic];
if ([ESCTUIManager TUIUserStatus] == false) { if ([ESCTUIManager TUIUserStatus] == false) {
@@ -452,7 +454,7 @@
chatVC.isVideo = false; chatVC.isVideo = false;
chatVC.eableSendReport = YES; chatVC.eableSendReport = YES;
chatVC.eableMapTools = false; chatVC.eableMapTools = false;
chatVC.navTitle = @"小助手"; chatVC.navTitle = @"全科医生";
chatVC.eablehaveHelathData = YES; chatVC.eablehaveHelathData = YES;
chatVC.questionType = 1; chatVC.questionType = 1;
chatVC.memberSex = @"2"; chatVC.memberSex = @"2";
@@ -465,11 +467,11 @@
NSDictionary * pamrDic = response; NSDictionary * pamrDic = response;
IMUserInfoModel * model = [IMUserInfoModel modelWithDictionary:pamrDic]; XJDIMUserInfoModel * model = [XJDIMUserInfoModel modelWithDictionary:pamrDic];
IMUserInfoModel * iminfoModel = [[IMUserInfoModel alloc] init]; XJDIMUserInfoModel * iminfoModel = [[XJDIMUserInfoModel alloc] init];
iminfoModel.IMInfo = pamrDic; iminfoModel.IMInfo = pamrDic;
[HQCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo]; [XJDCommonUtils keyedArchiverWithData:iminfoModel key:IMLoginUserInfo];
// 1. IM SDKAppID // 1. IM SDKAppID
// 2. config // 2. config
@@ -513,10 +515,10 @@
NSDictionary * parDic = response; NSDictionary * parDic = response;
YXDoctorInfoModel * model = [YXDoctorInfoModel modelWithDictionary:parDic]; XJDDoctorInfoModel * model = [XJDDoctorInfoModel modelWithDictionary:parDic];
self.nameLabel.text = model.doctorName; self.nameLabel.text = model.doctorName;
self.workLabel.text = [NSString stringWithFormat:@"%@",model.doctorTitle] ; self.workLabel.text = [NSString stringWithFormat:@"%@",model.doctorTitle] ;
CGFloat workW = [HQCommonUtils getLengthFromText:self.workLabel.text andFontSize:13]; CGFloat workW = [XJDCommonUtils getLengthFromText:self.workLabel.text andFontSize:13];
self.workLabel.width = workW; self.workLabel.width = workW;
self.hospatilLabel.text = [NSString stringWithFormat:@"%@ %@",model.resourceName,model.departmentName]; self.hospatilLabel.text = [NSString stringWithFormat:@"%@ %@",model.resourceName,model.departmentName];
@@ -531,13 +533,114 @@
[self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:[UIImage imageNamed:@"doctorNoImage"]]; [self.heardImage sd_setImageWithURL:[NSURL URLWithString:encodedString3] placeholderImage:[UIImage imageNamed:@"doctorNoImage"]];
} }
if ([tag isEqualToString:@"UPVERSION"]) {
NSDictionary * dic = response;
UPAppVesionModel * model = [UPAppVesionModel modelWithDictionary:dic];
// 1.0.10 1.0.1
NSString *version =
[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
NSString *versionCode =
[version stringByReplacingOccurrencesOfString:@"." withString:@""];
NSInteger loctaionVesion = [versionCode integerValue];
NSDictionary * infoDic = @{
@"version":[NSString stringWithFormat:@"%@",model.versionName] ,
@"releaseNotes":model.updateContent,
@"currentVersionReleaseDate":model.updateTime};
PSAppInfo * info = [[PSAppInfo alloc] initWithDict:infoDic];
//
BOOL isNeed = [model.forced integerValue] == 1 ? YES : NO;
if ( model.versionNo > loctaionVesion) {
[self show:info isNeedUpdate:isNeed];
}else
{
DLog(@"不需要更新");
}
}
if ([tag isEqualToString:@"myParticipatedOrders"]) {
[self hiddenAllMBProgressHUD];
NSDictionary *dic = [response isKindOfClass:[NSDictionary class]] ? response : nil;
NSArray *records = dic[@"records"];
if (![records isKindOfClass:[NSArray class]] || records.count == 0) {
[EasyTextView showErrorText:@"暂无进行中的应急工单"];
return;
}
NSMutableArray *models = [NSMutableArray array];
for (NSDictionary *d in records) {
[models addObject:[XJParticipatedOrderModel modelWithDictionary:d]];
}
if (models.count == 1 && [dic[@"total"] integerValue] == 1) {
XJParticipatedOrderModel *m = models.firstObject;
ChatViewController *chatVC = [[ChatViewController alloc] init];
chatVC.isGroupID = YES;
chatVC.isFromFirstAid = YES;
chatVC.isVideo = YES;
chatVC.chatID = m.sessionId;
chatVC.navTitle = @"应急求助";
[self.navigationController pushViewController:chatVC animated:YES];
return;
}
self.orderList = models;
[self showOrderListPopup:self.orderList];
}
}
//
- (void)show:(PSAppInfo *)info isNeedUpdate:(BOOL)isNeed {
__weak typeof(self)weakSelf = self;
if(isNeed == true) { //
self.checkVersionView = [[PSCheckVersionView alloc]
initWithAppInfo:info
confirm:^{
[weakSelf jumpAppStoreUpdate];
}];
}else {
self.checkVersionView = [[PSCheckVersionView alloc] initWithAppInfo:info confirm:^{
[weakSelf jumpAppStoreUpdate];
} cancel:^{
[self.coverView removeFromSuperview];
}];
}
[self.coverView addSubview:self.checkVersionView];
[self.checkVersionView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.equalTo(self.coverView).multipliedBy(0.75);
make.height.equalTo(self.coverView).multipliedBy(0.33);
make.center.equalTo(self.coverView);
}];
[[UIApplication sharedApplication].keyWindow.rootViewController.view addSubview:self.coverView];
}
- (void)jumpAppStoreUpdate {
//退
exit(0);
} }
- (void)topAction:(UIButton *)btn { - (void)topAction:(UIButton *)btn {
YXQustionRecordViewController * recoredVC = [[YXQustionRecordViewController alloc] init]; XJDQustionRecordViewController * recoredVC = [[XJDQustionRecordViewController alloc] init];
// //
if (btn.tag == 1000) { if (btn.tag == 1000) {
@@ -555,7 +658,7 @@
} }
- (void)loginImAccount { - (void)loginImAccount {
YXNetAPI * proctocolApi = [[YXNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil]; XJDNetAPI * proctocolApi = [[XJDNetAPI alloc] init:self tag:@"loginIMAPI" NeedToken:nil];
[proctocolApi GetIMLoginAccount:nil]; [proctocolApi GetIMLoginAccount:nil];
} }
@@ -583,7 +686,7 @@
if ([title isEqualToString:@"视频咨询"]) { if ([title isEqualToString:@"视频咨询"]) {
leftImg.image = [UIImage imageNamed:@"home_VideoQustion"]; leftImg.image = [UIImage imageNamed:@"home_VideoQustion"];
} }
if ([title isEqualToString:@"小助手"]) { if ([title isEqualToString:@"全科医生"]) {
leftImg.image = [UIImage imageNamed:@"home_small"]; leftImg.image = [UIImage imageNamed:@"home_small"];
} }
leftImg.backgroundColor = [UIColor greenColor]; leftImg.backgroundColor = [UIColor greenColor];
@@ -643,6 +746,7 @@
numLabel.layer.masksToBounds = true; numLabel.layer.masksToBounds = true;
numLabel.backgroundColor = UIColorHex(#21BEBD); numLabel.backgroundColor = UIColorHex(#21BEBD);
numLabel.tag = NumberTag; numLabel.tag = NumberTag;
numLabel.hidden = YES;
[replayBtn addSubview:numLabel]; [replayBtn addSubview:numLabel];
// //
UIButton * qustionBtn = [[UIButton alloc] initWithFrame:CGRectMake(view.width/3 , linView.bottom ,view.width/3 , 45)]; UIButton * qustionBtn = [[UIButton alloc] initWithFrame:CGRectMake(view.width/3 , linView.bottom ,view.width/3 , 45)];
@@ -663,6 +767,7 @@
jingxingLabel.layer.masksToBounds = true; jingxingLabel.layer.masksToBounds = true;
jingxingLabel.backgroundColor = UIColorHex(#21BEBD); jingxingLabel.backgroundColor = UIColorHex(#21BEBD);
jingxingLabel.tag = NumberTag + 10; jingxingLabel.tag = NumberTag + 10;
jingxingLabel.hidden = YES;
[qustionBtn addSubview:jingxingLabel]; [qustionBtn addSubview:jingxingLabel];
// //
@@ -683,6 +788,7 @@
wanchengLabel.layer.masksToBounds = true; wanchengLabel.layer.masksToBounds = true;
wanchengLabel.backgroundColor = UIColorHex(#21BEBD); wanchengLabel.backgroundColor = UIColorHex(#21BEBD);
wanchengLabel.tag = NumberTag + 20; wanchengLabel.tag = NumberTag + 20;
wanchengLabel.hidden = YES;
[wanchengBtn addSubview:wanchengLabel]; [wanchengBtn addSubview:wanchengLabel];
return view; return view;
@@ -690,7 +796,7 @@
#pragma mark:待回复 #pragma mark:待回复
- (void)daihuifuAction:(UIButton *)daihuifuBtn { - (void)daihuifuAction:(UIButton *)daihuifuBtn {
YXQustionRecordViewController * recoredVC = [[YXQustionRecordViewController alloc] init]; XJDQustionRecordViewController * recoredVC = [[XJDQustionRecordViewController alloc] init];
// //
if (daihuifuBtn.tag == 1100) { if (daihuifuBtn.tag == 1100) {
@@ -707,7 +813,7 @@
} }
#pragma mark:进行中 #pragma mark:进行中
- (void)jingxingAction:(UIButton *)jingxingBtn { - (void)jingxingAction:(UIButton *)jingxingBtn {
YXQustionRecordViewController * recoredVC = [[YXQustionRecordViewController alloc] init]; XJDQustionRecordViewController * recoredVC = [[XJDQustionRecordViewController alloc] init];
// //
if (jingxingBtn.tag == 1101) { if (jingxingBtn.tag == 1101) {
@@ -726,7 +832,7 @@
#pragma mark:已完成 #pragma mark:已完成
- (void)wanchengAction:(UIButton *)wancgengBtn { - (void)wanchengAction:(UIButton *)wancgengBtn {
YXQustionRecordViewController * recoredVC = [[YXQustionRecordViewController alloc] init]; XJDQustionRecordViewController * recoredVC = [[XJDQustionRecordViewController alloc] init];
// //
if (wancgengBtn.tag == 1102) { if (wancgengBtn.tag == 1102) {
@@ -744,31 +850,323 @@
- (void)pictureQuestionAction { - (void)pictureQuestionAction {
YXStopQuestionSettingVC * detailVC = [[YXStopQuestionSettingVC alloc] init]; XJDStopQuestionSettingVC * detailVC = [[XJDStopQuestionSettingVC alloc] init];
[self.navigationController pushViewController:detailVC animated:YES]; [self.navigationController pushViewController:detailVC animated:YES];
} }
//线 userSig // /
- (void)onKickedOffline { - (void)onKickedOffline {
[HQCommonUtils keyedArchiverWithData:nil key:LoginUserInfo];
[ESCTUIManager outLoginTUISDK]; [ESCTUIManager outLoginTUISDK];
KPostNotification(KNotificationLoginStateChange, @NO); [XJDCommonUtils keyedArchiverWithData:nil key:LoginUserInfo];
dispatch_async(dispatch_get_main_queue(), ^{
[EasyTextView showErrorText:@"账号在其他设备登录,请重新登录"];
KPostNotification(KNotificationLoginStateChange, @NO);
});
} }
- (void)onConnectFailed:(int)code err:(NSString *)err {
[self loginImAccount];
}
#pragma mark - ————— 应急求助 —————
/* - (void)sosEmergencyAction {
#pragma mark - Navigation [self showMBProgressHUDWithString:@"加载中..." autoHidden:false];
// In a storyboard-based application, you will often want to do a little preparation before navigation NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { [parmDic setObject:@(1) forKey:@"pageNo"];
// Get the new view controller using [segue destinationViewController]. [parmDic setObject:@"10" forKey:@"pageSize"];
// Pass the selected object to the new view controller. XJDNetAPI * api = [[XJDNetAPI alloc] init:self tag:@"myParticipatedOrders" NeedToken:@""];
[api getMyParticipatedOrders:parmDic];
}
#pragma mark - 工单列表弹窗
- (void)showOrderListPopup:(NSArray<XJParticipatedOrderModel *> *)models {
self.selectedOrderIndex = -1;
UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
UIView *mask = [[UIView alloc] initWithFrame:keyWindow.bounds];
mask.backgroundColor = [UIColor colorWithWhite:0 alpha:0.4];
mask.tag = 9001;
[keyWindow addSubview:mask];
CGFloat panelW = kScreenWidth - 46;
CGFloat panelH = 490;
CGFloat panelX = 23;
CGFloat panelY = (kScreenHeight - panelH) * 0.45;
UIView *panel = [[UIView alloc] initWithFrame:CGRectMake(panelX, panelY, panelW, panelH)];
panel.backgroundColor = KWhiteColor;
panel.layer.cornerRadius = 23;
panel.layer.masksToBounds = YES;
panel.tag = 9002;
[keyWindow addSubview:panel];
UILabel *titleLbl = [[UILabel alloc] init];
titleLbl.text = @"请选择正在应急的工单";
titleLbl.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold];
titleLbl.textColor = UIColorHex(0x252535);
[titleLbl sizeToFit];
titleLbl.top = 24;
titleLbl.centerX = panelW / 2;
[panel addSubview:titleLbl];
UIButton *closeBtn = [[UIButton alloc] initWithFrame:CGRectMake(panelW - 20 - 24, 21, 24, 24)];
closeBtn.backgroundColor = UIColorHex(0xF1F5F9);
closeBtn.layer.cornerRadius = 12;
UILabel *xLbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 24, 24)];
xLbl.text = @"\u2715"; xLbl.font = [UIFont systemFontOfSize:13];
xLbl.textColor = UIColorHex(0x77849E); xLbl.textAlignment = NSTextAlignmentCenter;
[closeBtn addSubview:xLbl];
[closeBtn addTarget:self action:@selector(dismissOrderPopup) forControlEvents:UIControlEventTouchUpInside];
[panel addSubview:closeBtn];
CGFloat sep1Y = titleLbl.bottom + 16;
UIView *sep1 = [[UIView alloc] initWithFrame:CGRectMake(0, sep1Y, panelW, 1)];
sep1.backgroundColor = UIColorHex(0xEAECFA);
[panel addSubview:sep1];
CGFloat btnH = 44;
UIButton *confirmBtn = [[UIButton alloc] initWithFrame:CGRectMake(20, panelH - 12 - btnH, panelW - 40, btnH)];
confirmBtn.backgroundColor = UIColorHex(0x2EB8B2);
confirmBtn.layer.cornerRadius = 12;
[confirmBtn setTitle:@"确认选择" forState:UIControlStateNormal];
[confirmBtn setTitleColor:KWhiteColor forState:UIControlStateNormal];
confirmBtn.titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold];
[confirmBtn addTarget:self action:@selector(onConfirmOrderSelection) forControlEvents:UIControlEventTouchUpInside];
[panel addSubview:confirmBtn];
CGFloat sep2Y = confirmBtn.top - 12;
UIView *sep2 = [[UIView alloc] initWithFrame:CGRectMake(0, sep2Y, panelW, 1)];
sep2.backgroundColor = UIColorHex(0xEAECFA);
[panel addSubview:sep2];
CGFloat tableY = sep1Y + 1, tableH = sep2Y - tableY;
self.orderPopupTable = [[UITableView alloc] initWithFrame:CGRectMake(0, tableY, panelW, tableH) style:UITableViewStylePlain];
self.orderPopupTable.delegate = self;
self.orderPopupTable.dataSource = self;
self.orderPopupTable.separatorStyle = UITableViewCellSeparatorStyleNone;
self.orderPopupTable.showsVerticalScrollIndicator = NO;
self.orderPopupTable.backgroundColor = KWhiteColor;
self.orderPopupTable.rowHeight = UITableViewAutomaticDimension;
self.orderPopupTable.estimatedRowHeight = 160;
if (@available(iOS 15.0, *)) { self.orderPopupTable.sectionHeaderTopPadding = 0; }
self.orderPopupTable.contentInset = UIEdgeInsetsZero;
__weak typeof(self) wk = self;
self.orderPopupTable.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
wk.orderPage = 1; NSMutableDictionary *p = [NSMutableDictionary dictionary];
p[@"pageNo"] = @(1); p[@"pageSize"] = @(10);
[[[XJDNetAPI alloc] init:wk tag:@"myParticipatedOrders" NeedToken:@""] getMyParticipatedOrders:p];
}];
self.orderPopupTable.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
wk.orderPage++; NSMutableDictionary *p = [NSMutableDictionary dictionary];
p[@"pageNo"] = @(wk.orderPage); p[@"pageSize"] = @(10);
[[[XJDNetAPI alloc] init:wk tag:@"myParticipatedOrders" NeedToken:@""] getMyParticipatedOrders:p];
}];
[panel addSubview:self.orderPopupTable];
panel.alpha = 0;
[UIView animateWithDuration:0.25 animations:^{ panel.alpha = 1; }];
}
- (void)dismissOrderPopup {
[[UIApplication.sharedApplication.keyWindow viewWithTag:9001] removeFromSuperview];
[[UIApplication.sharedApplication.keyWindow viewWithTag:9002] removeFromSuperview];
}
- (void)onConfirmOrderSelection {
if (self.selectedOrderIndex < 0 || self.selectedOrderIndex >= self.orderList.count) return;
XJParticipatedOrderModel *m = self.orderList[self.selectedOrderIndex];
[self dismissOrderPopup];
ChatViewController *chatVC = [[ChatViewController alloc] init];
chatVC.isGroupID = YES;
chatVC.isFromFirstAid = YES;
chatVC.isVideo = YES;
chatVC.chatID = m.sessionId;
chatVC.navTitle = @"应急求助";
[self.navigationController pushViewController:chatVC animated:YES];
}
#pragma mark - 工单列表 TableView
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (tableView == self.orderPopupTable) return self.orderList.count;
return 0;
}
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
if (tableView == self.orderPopupTable) return 0.01;
return 0;
}
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
if (tableView == self.orderPopupTable) return [UIView new];
return nil;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
static NSString *cid = @"OrderCell";
if (tableView != self.orderPopupTable) return [UITableViewCell new];
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cid];
XJParticipatedOrderModel *m = self.orderList[indexPath.row];
BOOL selected = (indexPath.row == self.selectedOrderIndex);
if (!cell) {
cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cid];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
cell.backgroundColor = KWhiteColor;
UIView *container = [[UIView alloc] init];
container.tag = 200;
container.layer.cornerRadius = 8;
container.layer.borderWidth = 1;
[cell.contentView addSubview:container];
[container mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.equalTo(cell.contentView).offset(12);
make.right.equalTo(cell.contentView).offset(-12);
make.bottom.equalTo(cell.contentView);
}];
UILabel *nameLbl = [[UILabel alloc] init];
nameLbl.tag = 201;
nameLbl.font = [UIFont systemFontOfSize:15 weight:UIFontWeightBold];
[container addSubview:nameLbl];
[nameLbl mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.equalTo(container).offset(16);
}];
UIImageView *indicator = [[UIImageView alloc] init];
indicator.tag = 202;
indicator.contentMode = UIViewContentModeScaleAspectFit;
[container addSubview:indicator];
[indicator mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(container).offset(-16);
make.top.equalTo(container).offset(14);
make.size.mas_equalTo(CGSizeMake(18, 18));
}];
UIView *deptBg = [[UIView alloc] init];
deptBg.tag = 209;
deptBg.layer.cornerRadius = 4;
deptBg.layer.masksToBounds = YES;
[container addSubview:deptBg];
[deptBg mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(container).offset(16);
make.top.equalTo(nameLbl.mas_bottom).offset(8);
make.height.mas_equalTo(20);
}];
UILabel *deptLbl = [[UILabel alloc] init];
deptLbl.tag = 203;
deptLbl.font = [UIFont systemFontOfSize:11 weight:UIFontWeightBold];
deptLbl.textAlignment = NSTextAlignmentCenter;
[deptBg addSubview:deptLbl];
[deptLbl mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(deptBg).offset(8);
make.right.equalTo(deptBg).offset(-8);
make.top.equalTo(deptBg).offset(3);
make.bottom.equalTo(deptBg).offset(-3);
}];
UIView *line = [[UIView alloc] init];
line.tag = 204;
line.backgroundColor = UIColorHex(0xEAECFA);
[container addSubview:line];
[line mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(container).offset(16);
make.right.equalTo(container).offset(-16);
make.top.equalTo(deptLbl.mas_bottom).offset(12);
make.height.mas_equalTo(1);
}];
UIImageView *orgIcon = [[UIImageView alloc] init];
orgIcon.tag = 205;
orgIcon.contentMode = UIViewContentModeScaleAspectFit;
[container addSubview:orgIcon];
[orgIcon mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(container).offset(16);
make.top.equalTo(line.mas_bottom).offset(12);
make.size.mas_equalTo(CGSizeMake(16, 16));
}];
UILabel *orgLbl = [[UILabel alloc] init];
orgLbl.tag = 206;
orgLbl.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium];
orgLbl.numberOfLines = 0;
[container addSubview:orgLbl];
[orgLbl mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(orgIcon.mas_right).offset(8);
make.top.equalTo(line.mas_bottom).offset(12);
make.right.equalTo(container).offset(-16);
}];
UIImageView *timeIcon = [[UIImageView alloc] init];
timeIcon.tag = 207;
timeIcon.contentMode = UIViewContentModeScaleAspectFit;
[container addSubview:timeIcon];
[timeIcon mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(container).offset(16);
make.top.equalTo(orgLbl.mas_bottom).offset(15);
make.size.mas_equalTo(CGSizeMake(16, 16));
}];
UILabel *timeLbl = [[UILabel alloc] init];
timeLbl.tag = 208;
timeLbl.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium];
[container addSubview:timeLbl];
[timeLbl mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(timeIcon.mas_right).offset(8);
make.centerY.equalTo(timeIcon);
make.right.equalTo(container).offset(-16);
make.bottom.equalTo(container).offset(-16);
}];
}
UIView *container = [cell.contentView viewWithTag:200];
UILabel *nameLbl = [container viewWithTag:201];
UIImageView *indicator = [container viewWithTag:202];
UIView *deptBg = [container viewWithTag:209];
UILabel *deptLbl = [container viewWithTag:203];
UIImageView *orgIcon = [container viewWithTag:205];
UILabel *orgLbl = [container viewWithTag:206];
UIImageView *timeIcon = [container viewWithTag:207];
UILabel *timeLbl = [container viewWithTag:208];
if (selected) {
container.layer.borderColor = UIColorHex(0x2EB8B280).CGColor;
container.backgroundColor = UIColorHex(0x2EB8B20F);
deptLbl.textColor = UIColorHex(0x2EB8B2); deptBg.backgroundColor = UIColorHex(0x2EB8B21A);
orgLbl.textColor = UIColorHex(0x2EB8B2);
timeLbl.textColor = UIColorHex(0x2EB8B2);
} else {
container.layer.borderColor = UIColorHex(0xE6E6EA).CGColor;
container.backgroundColor = KWhiteColor;
deptLbl.textColor = UIColorHex(0x77849E); deptBg.backgroundColor = UIColorHex(0x77849E1A);
orgLbl.textColor = UIColorHex(0x77849E);
timeLbl.textColor = UIColorHex(0x77849E);
}
nameLbl.textColor = UIColorHex(0x252535);
nameLbl.text = m.salvageUserName ?: @"--";
deptLbl.text = [NSString stringWithFormat:@" %@ ", m.deptName ?: @""];
indicator.image = [UIImage imageNamed:selected ? @"order_selected" : @"order_unselected"];
orgIcon.image = [UIImage imageNamed:selected ? @"org_selected" : @"org_unselected"];
orgLbl.text = m.orgName ?: @"";
timeIcon.image = [UIImage imageNamed:selected ? @"time_selected" : @"time_unselected"];
timeLbl.text = m.createTime.length > 0 ? [NSString stringWithFormat:@"求助时间:%@", m.createTime] : @"";
return cell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if (tableView == self.orderPopupTable) {
self.selectedOrderIndex = indexPath.row;
[tableView reloadData];
}
} }
*/
@end @end
@@ -0,0 +1,16 @@
//
// XJDSOSDoctorDetailVC.h
// DoctorXinjiang
//
#import "YXBaseViewController.h"
NS_ASSUME_NONNULL_BEGIN
@interface XJDSOSDoctorDetailVC : YXBaseViewController
@property (nonatomic, copy) NSString * sessionId;
@end
NS_ASSUME_NONNULL_END
@@ -0,0 +1,131 @@
//
// XJDSOSDoctorDetailVC.m
// DoctorXinjiang
//
#import "XJDSOSDoctorDetailVC.h"
#import "XJDSOSDoctorDetailInfoModel.h"
#import "XJDSOSDoctorModel.h"
@interface XJDSOSDoctorDetailVC ()
@property (nonatomic, strong) UIScrollView * mainScrollView;
@property (nonatomic, strong) XJDSOSDoctorDetailInfoModel * detailModel;
@end
@implementation XJDSOSDoctorDetailVC
- (void)viewDidLoad {
[super viewDidLoad];
self.isHidenNaviBar = false;
self.navigationItem.title = @"应急就医";
self.view.backgroundColor = CViewBgColor;
[self createUI];
[self loadData];
}
- (void)createUI {
self.mainScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - kTopHeight)];
self.mainScrollView.backgroundColor = CViewBgColor;
[self.view addSubview:self.mainScrollView];
}
- (void)loadData {
[self showMBProgressHUDWithString:@"加载中..." autoHidden:false];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:self.sessionId forKey:@"id"];
XJDNetAPI * detailApi = [[XJDNetAPI alloc] init:self tag:@"SOSDETAIL" NeedToken:@""];
[detailApi getSOSDoctorDetailInfo:parmDic];
}
- (void)Failed:(NSString*)message tag:(NSString*)tag {
[self hiddenAllMBProgressHUD];
[EasyTextView showErrorText:message];
}
- (void)Sucess:(id)response tag:(NSString*)tag {
if ([tag isEqualToString:@"SOSDETAIL"]) {
[self hiddenAllMBProgressHUD];
NSDictionary * dic = response;
self.detailModel = [XJDSOSDoctorDetailInfoModel modelWithDictionary:dic];
[self buildDetailUI];
}
}
- (void)buildDetailUI {
CGFloat topY = 10;
CGFloat cardW = kScreenWidth - 30;
CGFloat cardX = 15;
// 工单信息卡片
UIView * infoCard = [self createInfoCard:CGRectMake(cardX, topY, cardW, 0)];
[self.mainScrollView addSubview:infoCard];
topY = infoCard.bottom + 10;
self.mainScrollView.contentSize = CGSizeMake(kScreenWidth, topY + 20);
}
- (UIView *)createInfoCard:(CGRect)frame {
UIView * card = [[UIView alloc] initWithFrame:frame];
card.backgroundColor = KWhiteColor;
card.layer.cornerRadius = 10;
card.layer.masksToBounds = YES;
CGFloat y = 15;
CGFloat leftX = 15;
CGFloat rightX = card.width - 15;
// 标题
UILabel * titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(leftX, y, card.width - 30, 16)];
titleLabel.text = @"工单信息";
titleLabel.font = BOLDSYSTEMFONT(16);
titleLabel.textColor = CFontColor1;
[card addSubview:titleLabel];
y = titleLabel.bottom + 15;
NSArray * infos = @[
@[@"求助人", self.detailModel.initiatorUserName ?: @"--"],
@[@"求助人性别", [self.detailModel.initiatorUserSex integerValue] == 1 ? @"" : @""],
@[@"求助人年龄", self.detailModel.initiatorUserAge ?: @"--"],
@[@"求助人手机", self.detailModel.initiatorUserMobile ?: @"--"],
@[@"求助人部门", self.detailModel.initiatorUserDepart ?: @"--"],
@[@"派单医院", self.detailModel.sendOrderHospital ?: @"--"],
@[@"接单医生", self.detailModel.stationUserName ?: @"--"],
@[@"医生手机", self.detailModel.stationUserMobile ?: @"--"],
@[@"医生部门", self.detailModel.stationUserDepart ?: @"--"],
@[@"状态", self.detailModel.orderStatus_dictText ?: @"--"],
@[@"创建时间", self.detailModel.createTime ?: @"--"],
];
for (NSArray * info in infos) {
UIView * row = [self createInfoRow:CGRectMake(leftX, y, card.width - 30, 32) label:info[0] value:info[1]];
[card addSubview:row];
y = row.bottom;
}
card.height = y + 15;
return card;
}
- (UIView *)createInfoRow:(CGRect)frame label:(NSString *)label value:(NSString *)value {
UIView * row = [[UIView alloc] initWithFrame:frame];
UILabel * labelL = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, frame.size.height)];
labelL.text = label;
labelL.font = SYSTEMFONT(14);
labelL.textColor = UIColorHex(#666666);
[row addSubview:labelL];
UILabel * valueL = [[UILabel alloc] initWithFrame:CGRectMake(110, 0, frame.size.width - 110, frame.size.height)];
valueL.text = value;
valueL.font = SYSTEMFONT(14);
valueL.textColor = CFontColor1;
valueL.textAlignment = NSTextAlignmentRight;
[row addSubview:valueL];
return row;
}
@end
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXBillDetailViewController : YXBaseViewController @interface XJDBillDetailViewController : YXBaseViewController
@property (nonatomic, strong) NSString * timeString; @property (nonatomic, strong) NSString * timeString;
@@ -5,14 +5,14 @@
// Created by on 2023/5/5. // Created by on 2023/5/5.
// //
#import "YXBillDetailViewController.h" #import "XJDBillDetailViewController.h"
#import "BRDatePickerView.h" #import "BRDatePickerView.h"
#import "BillListTable.h" #import "XJDBillListTable.h"
#import "YXBillListModel.h" #import "XJDBillListModel.h"
@interface YXBillDetailViewController () @interface XJDBillDetailViewController ()
@property (nonatomic, strong) BillListTable * homeTable; @property (nonatomic, strong) XJDBillListTable * homeTable;
@property (nonatomic, assign) NSInteger pageNo; @property (nonatomic, assign) NSInteger pageNo;
@@ -20,7 +20,7 @@
@end @end
@implementation YXBillDetailViewController @implementation XJDBillDetailViewController
- (NSMutableArray *)dataArray { - (NSMutableArray *)dataArray {
@@ -43,7 +43,7 @@
- (void)setupUI { - (void)setupUI {
self.homeTable = [[BillListTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; self.homeTable = [[XJDBillListTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
MJWeakSelf MJWeakSelf
[self.view addSubview:self.homeTable]; [self.view addSubview:self.homeTable];
@@ -76,7 +76,7 @@
[parmDic setObject:@"3" forKey:@"type"]; [parmDic setObject:@"3" forKey:@"type"];
[parmDic setObject:self.timeString forKey:@"date"]; [parmDic setObject:self.timeString forKey:@"date"];
YXNetAPI * billAPI = [[YXNetAPI alloc] init:self tag:@"BillAPI" NeedToken:@""]; XJDNetAPI * billAPI = [[XJDNetAPI alloc] init:self tag:@"BillAPI" NeedToken:@""];
[billAPI GetBillListData:parmDic]; [billAPI GetBillListData:parmDic];
@@ -102,7 +102,7 @@
NSDictionary * dic = response; NSDictionary * dic = response;
YXBillListModel * model = [YXBillListModel modelWithDictionary:dic]; XJDBillListModel * model = [XJDBillListModel modelWithDictionary:dic];
self.homeTable.dataArray = model.records; self.homeTable.dataArray = model.records;
} }
@@ -1,5 +1,5 @@
// //
// YXBillListViewController.h // XJDBillListViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/5/5. // Created by 仁康信息 on 2023/5/5.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXBillListViewController : YXBaseViewController @interface XJDBillListViewController : YXBaseViewController
@property (nonatomic, strong) NSString * timeString; @property (nonatomic, strong) NSString * timeString;
@@ -1,24 +1,24 @@
// //
// YXBillListViewController.m // XJDBillListViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/5/5. // Created by on 2023/5/5.
// //
#import "YXBillListViewController.h" #import "XJDBillListViewController.h"
#import "BillListTable.h" #import "XJDBillListTable.h"
#import "YXWithdrawCashDetailViewController.h" #import "XJDWithdrawCashDetailViewController.h"
#import "YXBillListModel.h" #import "XJDBillListModel.h"
@interface YXBillListViewController () @interface XJDBillListViewController ()
@property (nonatomic, strong) BillListTable * homeTable; @property (nonatomic, strong) XJDBillListTable * homeTable;
@property (nonatomic, assign) NSInteger pageNo; @property (nonatomic, assign) NSInteger pageNo;
@property (nonatomic, strong) NSMutableArray * dataArray; @property (nonatomic, strong) NSMutableArray * dataArray;
@end @end
@implementation YXBillListViewController @implementation XJDBillListViewController
- (NSMutableArray *)dataArray { - (NSMutableArray *)dataArray {
@@ -40,11 +40,11 @@
- (void)setupUI { - (void)setupUI {
self.homeTable = [[BillListTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; self.homeTable = [[XJDBillListTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
MJWeakSelf MJWeakSelf
self.homeTable.detailBlock = ^(NSString * _Nonnull billString) { self.homeTable.detailBlock = ^(NSString * _Nonnull billString) {
YXWithdrawCashDetailViewController * detailVC = [[YXWithdrawCashDetailViewController alloc] init]; XJDWithdrawCashDetailViewController * detailVC = [[XJDWithdrawCashDetailViewController alloc] init];
[weakSelf.navigationController pushViewController:detailVC animated:YES]; [weakSelf.navigationController pushViewController:detailVC animated:YES];
}; };
@@ -77,7 +77,7 @@
[parmDic setObject:@(10) forKey:@"pageSize"]; [parmDic setObject:@(10) forKey:@"pageSize"];
[parmDic setObject:@"1" forKey:@"type"]; [parmDic setObject:@"1" forKey:@"type"];
YXNetAPI * billAPI = [[YXNetAPI alloc] init:self tag:@"BillAPI" NeedToken:@""]; XJDNetAPI * billAPI = [[XJDNetAPI alloc] init:self tag:@"BillAPI" NeedToken:@""];
[billAPI GetBillListData:parmDic]; [billAPI GetBillListData:parmDic];
@@ -103,7 +103,7 @@
NSDictionary * dic = response; NSDictionary * dic = response;
YXBillListModel * model = [YXBillListModel modelWithDictionary:dic]; XJDBillListModel * model = [XJDBillListModel modelWithDictionary:dic];
self.homeTable.dataArray = model.records; self.homeTable.dataArray = model.records;
} }
@@ -1,5 +1,5 @@
// //
// YXBillViewController.h // XJDBillViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/17. // Created by 仁康信息 on 2023/8/17.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXBillViewController : YXBaseViewController @interface XJDBillViewController : YXBaseViewController
@end @end
@@ -1,17 +1,17 @@
// //
// YXBillViewController.m // XJDBillViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/8/17. // Created by on 2023/8/17.
// //
#import "YXBillViewController.h" #import "XJDBillViewController.h"
#import "YXBillListViewController.h" #import "XJDBillListViewController.h"
#import "YXBillWithDrawViewController.h" #import "XJDBillWithDrawViewController.h"
#import "YXBillDetailViewController.h" #import "XJDBillDetailViewController.h"
#import "BRDatePickerView.h" #import "BRDatePickerView.h"
@interface YXBillViewController ()<UICollectionViewDataSource,UICollectionViewDelegate> @interface XJDBillViewController ()<UICollectionViewDataSource,UICollectionViewDelegate>
/** 顶部控件*/ /** 顶部控件*/
@property (nonatomic, weak) UIScrollView *topView; @property (nonatomic, weak) UIScrollView *topView;
@@ -28,15 +28,15 @@
@property (nonatomic, assign) NSInteger selectedOnes; @property (nonatomic, assign) NSInteger selectedOnes;
@property (nonatomic, strong) YXBillDetailViewController * allVC; @property (nonatomic, strong) XJDBillDetailViewController * allVC;
@property (nonatomic, strong) YXBillListViewController * listVc ; @property (nonatomic, strong) XJDBillListViewController * listVc ;
@property (nonatomic, strong) YXBillWithDrawViewController * drawVc; @property (nonatomic, strong) XJDBillWithDrawViewController * drawVc;
@end @end
@implementation YXBillViewController @implementation XJDBillViewController
#pragma mark - 懒加载 #pragma mark - 懒加载
- (NSMutableArray *)titleButtons { - (NSMutableArray *)titleButtons {
@@ -120,7 +120,7 @@
#pragma mark - 添加所有的子控制器 #pragma mark - 添加所有的子控制器
- (void)setupAllChildViewController { - (void)setupAllChildViewController {
YXBillDetailViewController * allVC = [[YXBillDetailViewController alloc] init]; XJDBillDetailViewController * allVC = [[XJDBillDetailViewController alloc] init];
allVC.view.backgroundColor = UIColorBackground; allVC.view.backgroundColor = UIColorBackground;
allVC.navigationItem.title = @"全部"; allVC.navigationItem.title = @"全部";
allVC.timeString = self.timeString; allVC.timeString = self.timeString;
@@ -128,14 +128,14 @@
[self addChildViewController:allVC]; [self addChildViewController:allVC];
// //
YXBillListViewController * listVc = [[YXBillListViewController alloc] init]; XJDBillListViewController * listVc = [[XJDBillListViewController alloc] init];
listVc.view.backgroundColor = UIColorBackground; listVc.view.backgroundColor = UIColorBackground;
listVc.navigationItem.title = @"收益记录"; listVc.navigationItem.title = @"收益记录";
listVc.timeString = self.timeString; listVc.timeString = self.timeString;
self.listVc = listVc; self.listVc = listVc;
[self addChildViewController:listVc]; [self addChildViewController:listVc];
YXBillWithDrawViewController * drawVc = [[YXBillWithDrawViewController alloc] init]; XJDBillWithDrawViewController * drawVc = [[XJDBillWithDrawViewController alloc] init];
drawVc.view.backgroundColor = UIColorBackground; drawVc.view.backgroundColor = UIColorBackground;
drawVc.navigationItem.title = @"提现记录"; drawVc.navigationItem.title = @"提现记录";
drawVc.timeString = self.timeString; drawVc.timeString = self.timeString;
@@ -1,5 +1,5 @@
// //
// YXBillWithDrawViewController.h // XJDBillWithDrawViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/17. // Created by 仁康信息 on 2023/8/17.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXBillWithDrawViewController : YXBaseViewController @interface XJDBillWithDrawViewController : YXBaseViewController
@property (nonatomic, strong) NSString * timeString; @property (nonatomic, strong) NSString * timeString;
@@ -1,23 +1,23 @@
// //
// YXBillWithDrawViewController.m // XJDBillWithDrawViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/8/17. // Created by on 2023/8/17.
// //
#import "YXBillWithDrawViewController.h" #import "XJDBillWithDrawViewController.h"
#import "BillListTable.h" #import "XJDBillListTable.h"
#import "YXBillListModel.h" #import "XJDBillListModel.h"
#import "YXWithdrawCashDetailViewController.h" #import "XJDWithdrawCashDetailViewController.h"
@interface YXBillWithDrawViewController () @interface XJDBillWithDrawViewController ()
@property (nonatomic, strong) BillListTable * homeTable; @property (nonatomic, strong) XJDBillListTable * homeTable;
@property (nonatomic, assign) NSInteger pageNo; @property (nonatomic, assign) NSInteger pageNo;
@property (nonatomic, strong) NSMutableArray * dataArray; @property (nonatomic, strong) NSMutableArray * dataArray;
@end @end
@implementation YXBillWithDrawViewController @implementation XJDBillWithDrawViewController
- (NSMutableArray *)dataArray { - (NSMutableArray *)dataArray {
@@ -41,11 +41,11 @@
- (void)setupUI { - (void)setupUI {
self.homeTable = [[BillListTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; self.homeTable = [[XJDBillListTable alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
MJWeakSelf MJWeakSelf
self.homeTable.detailBlock = ^(NSString * _Nonnull billString) { self.homeTable.detailBlock = ^(NSString * _Nonnull billString) {
YXWithdrawCashDetailViewController * detailVC = [[YXWithdrawCashDetailViewController alloc] init]; XJDWithdrawCashDetailViewController * detailVC = [[XJDWithdrawCashDetailViewController alloc] init];
detailVC.bill_id = billString; detailVC.bill_id = billString;
[weakSelf.navigationController pushViewController:detailVC animated:YES]; [weakSelf.navigationController pushViewController:detailVC animated:YES];
}; };
@@ -78,7 +78,7 @@
[parmDic setObject:@(10) forKey:@"pageSize"]; [parmDic setObject:@(10) forKey:@"pageSize"];
[parmDic setObject:@"2" forKey:@"type"]; [parmDic setObject:@"2" forKey:@"type"];
YXNetAPI * billAPI = [[YXNetAPI alloc] init:self tag:@"BillAPI" NeedToken:@""]; XJDNetAPI * billAPI = [[XJDNetAPI alloc] init:self tag:@"BillAPI" NeedToken:@""];
[billAPI GetBillListData:parmDic]; [billAPI GetBillListData:parmDic];
@@ -104,7 +104,7 @@
NSDictionary * dic = response; NSDictionary * dic = response;
YXBillListModel * model = [YXBillListModel modelWithDictionary:dic]; XJDBillListModel * model = [XJDBillListModel modelWithDictionary:dic];
self.homeTable.dataArray = model.records; self.homeTable.dataArray = model.records;
} }
@@ -1,5 +1,5 @@
// //
// YXWithdrawCashDetailViewController.h // XJDWithdrawCashDetailViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/5/5. // Created by 仁康信息 on 2023/5/5.
@@ -8,7 +8,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXWithdrawCashDetailViewController : YXBaseViewController @interface XJDWithdrawCashDetailViewController : YXBaseViewController
@property (nonatomic, strong) NSString * bill_id; @property (nonatomic, strong) NSString * bill_id;
@@ -1,22 +1,22 @@
// //
// YXWithdrawCashDetailViewController.m // XJDWithdrawCashDetailViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/5/5. // Created by on 2023/5/5.
// //
#import "YXWithdrawCashDetailViewController.h" #import "XJDWithdrawCashDetailViewController.h"
#import "BillDtailTable.h" #import "XJDBillDtailTable.h"
#import "YXwithDrawDetailModel.h" #import "XJDWithDrawDetailModel.h"
@interface YXWithdrawCashDetailViewController () @interface XJDWithdrawCashDetailViewController ()
@property (nonatomic, strong) UILabel * moneyLabel; @property (nonatomic, strong) UILabel * moneyLabel;
@property (nonatomic, strong) UILabel * aroundLabel; @property (nonatomic, strong) UILabel * aroundLabel;
@property (nonatomic, strong) BillDtailTable * homeTable; @property (nonatomic, strong) XJDBillDtailTable * homeTable;
@end @end
@implementation YXWithdrawCashDetailViewController @implementation XJDWithdrawCashDetailViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
@@ -60,7 +60,7 @@
self.homeTable = [[BillDtailTable alloc] initWithFrame:CGRectMake(kRealValue(15), tishiLabel.bottom + kRealValue(22), kScreenWidth - kRealValue(30), kScreenHeight - tishiLabel.bottom - kRealValue(68) - kTopHeight) style:UITableViewStyleGrouped]; self.homeTable = [[XJDBillDtailTable alloc] initWithFrame:CGRectMake(kRealValue(15), tishiLabel.bottom + kRealValue(22), kScreenWidth - kRealValue(30), kScreenHeight - tishiLabel.bottom - kRealValue(68) - kTopHeight) style:UITableViewStyleGrouped];
self.homeTable.layer.cornerRadius = 10; self.homeTable.layer.cornerRadius = 10;
self.homeTable.layer.masksToBounds = true; self.homeTable.layer.masksToBounds = true;
[self.view addSubview:self.homeTable]; [self.view addSubview:self.homeTable];
@@ -72,7 +72,7 @@
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[parmDic setObject:self.bill_id forKey:@"id"]; [parmDic setObject:self.bill_id forKey:@"id"];
YXNetAPI * deatilApi = [[YXNetAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""]; XJDNetAPI * deatilApi = [[XJDNetAPI alloc] init:self tag:@"DETAILAPI" NeedToken:@""];
[deatilApi withDrawDetailsData:parmDic]; [deatilApi withDrawDetailsData:parmDic];
} }
@@ -96,7 +96,7 @@
NSDictionary * dic = response; NSDictionary * dic = response;
YXwithDrawDetailModel * model = [YXwithDrawDetailModel modelWithDictionary:dic]; XJDWithDrawDetailModel * model = [XJDWithDrawDetailModel modelWithDictionary:dic];
self.moneyLabel.text =[NSString stringWithFormat:@"%@",model.paymentMoney] ; self.moneyLabel.text =[NSString stringWithFormat:@"%@",model.paymentMoney] ;
self.aroundLabel.text = [NSString stringWithFormat:@"到账:%@",model.realityMoney] ; self.aroundLabel.text = [NSString stringWithFormat:@"到账:%@",model.realityMoney] ;
@@ -1,5 +1,5 @@
// //
// YXworkSetingViewController.h // XJDworkSetingViewController.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/6. // Created by 仁康信息 on 2023/8/6.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXworkSetingViewController : YXBaseViewController @interface XJDworkSetingViewController : YXBaseViewController
@end @end
@@ -1,16 +1,16 @@
// //
// YXworkSetingViewController.m // XJDworkSetingViewController.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/8/6. // Created by on 2023/8/6.
// //
#import "YXworkSetingViewController.h" #import "XJDworkSetingViewController.h"
#import "YXWorkSettingModel.h" #import "XJDWorkSettingModel.h"
#import "YXCustomSchedulingViewController.h" #import "XJDCustomSchedulingViewController.h"
@interface YXworkSetingViewController () @interface XJDworkSetingViewController ()
@property (nonatomic, strong) UIScrollView * mainScrollview; @property (nonatomic, strong) UIScrollView * mainScrollview;
@@ -44,7 +44,7 @@
@end @end
@implementation YXworkSetingViewController @implementation XJDworkSetingViewController
#pragma mark:懒加载 #pragma mark:懒加载
@@ -157,7 +157,7 @@
- (void)createData { - (void)createData {
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"WEEKAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"WEEKAPI" NeedToken:@""];
NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init];
[workApi GetDoctorWorkSetting:parmDic]; [workApi GetDoctorWorkSetting:parmDic];
@@ -177,7 +177,7 @@
weekLabel.font = SYSTEMFONT(13); weekLabel.font = SYSTEMFONT(13);
weekLabel.text = week; weekLabel.text = week;
[view addSubview:weekLabel]; [view addSubview:weekLabel];
CGFloat amWidth = [HQCommonUtils getLengthFromText:@"上午" andFontSize:13]; CGFloat amWidth = [XJDCommonUtils getLengthFromText:@"上午" andFontSize:13];
UILabel * amLabel = [[UILabel alloc] initWithFrame:CGRectMake(weekLabel.right, 0, amWidth, view.height)]; UILabel * amLabel = [[UILabel alloc] initWithFrame:CGRectMake(weekLabel.right, 0, amWidth, view.height)];
amLabel.text = @"上午"; amLabel.text = @"上午";
amLabel.textAlignment = NSTextAlignmentLeft; amLabel.textAlignment = NSTextAlignmentLeft;
@@ -195,7 +195,7 @@
pepleField.tag = amTag; pepleField.tag = amTag;
[view addSubview:pepleField]; [view addSubview:pepleField];
CGFloat peoWidth = [HQCommonUtils getLengthFromText:@"" andFontSize:13]; CGFloat peoWidth = [XJDCommonUtils getLengthFromText:@"" andFontSize:13];
UILabel * peoLabel = [[UILabel alloc] initWithFrame:CGRectMake(pepleField.right + 5, 0, peoWidth, view.height)]; UILabel * peoLabel = [[UILabel alloc] initWithFrame:CGRectMake(pepleField.right + 5, 0, peoWidth, view.height)];
peoLabel.text = @""; peoLabel.text = @"";
peoLabel.textAlignment = NSTextAlignmentLeft; peoLabel.textAlignment = NSTextAlignmentLeft;
@@ -312,9 +312,9 @@
} }
else else
{ {
NSArray * array = [NSArray modelArrayWithClass:[YXWorkTimeModel class] json:self.peopleArray]; NSArray * array = [NSArray modelArrayWithClass:[XJDWorkTimeModel class] json:self.peopleArray];
for (YXWorkTimeModel * model in self.peopleArray) { for (XJDWorkTimeModel * model in self.peopleArray) {
NSString * jsonString = [model modelToJSONObject]; NSString * jsonString = [model modelToJSONObject];
[dataArray addObject:jsonString]; [dataArray addObject:jsonString];
} }
@@ -345,7 +345,7 @@
[parmDic setObject:@(0) forKey:@"tfDefault"]; [parmDic setObject:@(0) forKey:@"tfDefault"];
[self showMBProgressHUDWithString:@"正在设置" autoHidden:false]; [self showMBProgressHUDWithString:@"正在设置" autoHidden:false];
YXNetAPI * workApi = [[YXNetAPI alloc] init:self tag:@"WorkAPI" NeedToken:@""]; XJDNetAPI * workApi = [[XJDNetAPI alloc] init:self tag:@"WorkAPI" NeedToken:@""];
@@ -381,7 +381,7 @@
[dic setObject:@(self.isVideo) forKey:@"audioStatus"]; [dic setObject:@(self.isVideo) forKey:@"audioStatus"];
} }
YXWorkTimeModel * model = [YXWorkTimeModel modelWithDictionary:dic]; XJDWorkTimeModel * model = [XJDWorkTimeModel modelWithDictionary:dic];
NSString * jsonString = [model modelToJSONObject]; NSString * jsonString = [model modelToJSONObject];
return jsonString; return jsonString;
} }
@@ -404,14 +404,14 @@
NSDictionary * resDic = response; NSDictionary * resDic = response;
YXWorkSettingModel * model = [YXWorkSettingModel modelWithDictionary:resDic]; XJDWorkSettingModel * model = [XJDWorkSettingModel modelWithDictionary:resDic];
[self.jumpSwithch setOn:[model.tfJumpHoliday boolValue] animated:YES]; [self.jumpSwithch setOn:[model.tfJumpHoliday boolValue] animated:YES];
[self.rightSlider setOn:[model.audioStatus boolValue] animated:YES]; [self.rightSlider setOn:[model.audioStatus boolValue] animated:YES];
[self switchChange:self.rightSlider]; [self switchChange:self.rightSlider];
self.peopleArray = model.list; self.peopleArray = model.list;
for (YXWorkTimeModel * timeModel in model.list) { for (XJDWorkTimeModel * timeModel in model.list) {
// //
[self haveDoctorWorkTime:timeModel]; [self haveDoctorWorkTime:timeModel];
@@ -422,7 +422,7 @@
} }
- (void)haveDoctorWorkTime:(YXWorkTimeModel *)timeModel { - (void)haveDoctorWorkTime:(XJDWorkTimeModel *)timeModel {
if ([timeModel.week intValue] == 1) { if ([timeModel.week intValue] == 1) {
self.oneID = timeModel.work_id; self.oneID = timeModel.work_id;
@@ -479,7 +479,7 @@
- (void)customAction { - (void)customAction {
YXCustomSchedulingViewController * customvc = [[YXCustomSchedulingViewController alloc] init]; XJDCustomSchedulingViewController * customvc = [[XJDCustomSchedulingViewController alloc] init];
[self.navigationController pushViewController:customvc animated:YES]; [self.navigationController pushViewController:customvc animated:YES];
@@ -1,74 +0,0 @@
//
// YXDoctorInfoModel.h
// healthQuestion
//
// Created by 仁康信息 on 2023/8/4.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXDoctorGoodSicknessModel : NSObject
@property (nonatomic, copy) NSString * sicks_id;
@property (nonatomic, copy) NSString * sicksName;
@end
@interface YXDoctorInfoModel : NSObject
@property (nonatomic, copy) NSString * doctor_Id;
@property (nonatomic, copy) NSString * sex;
@property (nonatomic, strong) NSArray<YXDoctorGoodSicknessModel *> * goodAtSicknessName;
@property (nonatomic, copy) NSString * doctorJob_dictText;
@property (nonatomic, copy) NSString * doctorName;
@property (nonatomic, copy) NSString * photo;
@property (nonatomic, copy) NSString * doctorTitle;
@property (nonatomic, copy) NSString * doctorStatus_dictText;
@property (nonatomic, copy) NSString * resourceName;
@property (nonatomic, copy) NSString * goodAtSymptom;
@property (nonatomic, copy) NSString * departmentName;
@property (nonatomic, copy) NSString * introduction;
@property (nonatomic, copy) NSString * goodAt;
@property (nonatomic, copy) NSString * userScore;
@property (nonatomic, copy) NSString * replyNum;
@property (nonatomic, copy) NSString * tfShowFire;
@property (nonatomic, copy) NSString * audioVideo;
@property (nonatomic, copy) NSString * audioStatus;
@property (nonatomic, copy) NSString * status;
@property (nonatomic, copy) NSString * resourceId;
@property (nonatomic, copy) NSString * experience;
@property (nonatomic, copy) NSString * doctorStatus;
@property (nonatomic, copy) NSString * departmentId;
@end
NS_ASSUME_NONNULL_END
@@ -1,49 +0,0 @@
//
// YXHomePageModel.h
// healthQuestion
//
// Created by 仁康信息 on 2022/9/9.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXHomePageModel : NSObject
@property (nonatomic, copy) NSString * imageName;
@property (nonatomic, copy) NSString * projectName;
@end
@interface HQProjectModel : NSObject
@property (nonatomic, copy) NSString * imageName;
@property (nonatomic, copy) NSString * projectName;
@property (nonatomic, copy) NSString * price;
@property (nonatomic, assign) BOOL isSelected;
@end
@interface HQSmallHelpModel : NSObject
@property (nonatomic, copy) NSString * groupId;
@property (nonatomic, strong) NSArray * member;
@property (nonatomic, copy) NSString * userId;
@property (nonatomic, copy) NSString * tfNew;
@property (nonatomic, copy) NSString * help_Id;
@end
NS_ASSUME_NONNULL_END
@@ -1,21 +0,0 @@
//
// YXQuestionBodyReportModel.h
// healthQuestion
//
// Created by 仁康信息 on 2023/8/16.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionBodyReportModel : NSObject
@property (nonatomic, strong) NSString * insertdate;
@property (nonatomic, strong) NSString * tjrq;
@property (nonatomic, strong) NSString * name;
@property (nonatomic, strong) NSString * yymc;
@end
NS_ASSUME_NONNULL_END
@@ -1,42 +0,0 @@
//
// YXQuestionRecordModel.h
// healthQuestion
//
// Created by 仁康信息 on 2023/8/15.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionRecordModel : NSObject
@property (nonatomic, copy) NSString * record_id;
@property (nonatomic, copy) NSString * memberId;
@property (nonatomic, copy) NSString * toAccount;
@property (nonatomic, copy) NSString * memberName;
@property (nonatomic, copy) NSString * memberSex;
@property (nonatomic, copy) NSString * memberAge;
@property (nonatomic, copy) NSString * imId;
@property (nonatomic, copy) NSString * image;
@property (nonatomic, copy) NSString * rejectReason;
@property (nonatomic, copy) NSString * doctorStartTime;
@property (nonatomic, copy) NSString * doctorEndTime;
@property (nonatomic, copy) NSString * contentStatus;
@property (nonatomic, copy) NSString * contentType;
@property (nonatomic, copy) NSString * medicalRecordsId;
@property (nonatomic, copy) NSString * schedulingDateId;
@property (nonatomic, copy) NSString * createTime;
@property (nonatomic, copy) NSString * sessionDate;
@property (nonatomic, copy) NSString * week;
@property (nonatomic, copy) NSString * amPm;
@property (nonatomic, copy) NSString * reasonType;
@property (nonatomic, copy) NSString * toAccountHead;
@property (nonatomic, copy) NSString * toAccountTitle;
@property (nonatomic, copy) NSString * departmentName;
@property (nonatomic, copy) NSString * hospitalLevel;
@property (nonatomic, copy) NSString * toAccountName;
@end
NS_ASSUME_NONNULL_END
@@ -1,22 +0,0 @@
//
// YXQuestionStaticsModel.h
// healthQuestion
//
// Created by 仁康信息 on 2023/8/8.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionStaticsModel : NSObject
@property (nonatomic, copy) NSString * total;
@property (nonatomic, copy) NSString * content_type;
@property (nonatomic, copy) NSString * inProgress;
@property (nonatomic, copy) NSString * completed;
@end
NS_ASSUME_NONNULL_END
@@ -1,53 +0,0 @@
//
// YXStopServiceModel.h
// healthQuestion
//
// Created by 仁康信息 on 2023/8/9.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface YXStopServiceListModel : NSObject
@property (nonatomic, copy) NSString * record_id;
@property (nonatomic, copy) NSString * notice;
@property (nonatomic, assign) NSInteger delFlag;
@property (nonatomic, copy) NSString * createBy;
@property (nonatomic, copy) NSString * startDay;
@property (nonatomic, copy) NSString * endDay;
@property (nonatomic, copy) NSString * stopReason;
@property (nonatomic, copy) NSString * doctorId;
@property (nonatomic, copy) NSString * createTime;
@property (nonatomic, assign) NSInteger serviceStatus;
@property (nonatomic, assign) NSInteger status;
@end
@interface YXStopServiceModel : NSObject
@property (nonatomic, strong) NSArray * orders;
@property (nonatomic, assign) NSInteger pages;
@property (nonatomic, assign) NSInteger current;
@property (nonatomic, assign) NSInteger total;
@property (nonatomic, strong) NSArray<YXStopServiceListModel *> * records;
@end
NS_ASSUME_NONNULL_END
@@ -0,0 +1,26 @@
//
// UPAppVesionModel.h
// DoctorXinjiang
//
// Created by Apple on 2025/12/25.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface UPAppVesionModel : NSObject
@property (nonatomic, copy) NSString * deviceType;
@property (nonatomic, strong) NSArray * ignoreFlag;
@property (nonatomic, copy) NSString * appUrl;
@property (nonatomic, copy) NSString * appStatus;
@property (nonatomic, copy) NSString * forced;
@property (nonatomic, assign) NSInteger versionNo;
@property (nonatomic, copy) NSString * updateContent;
@property (nonatomic, copy) NSString * versionName;
@property (nonatomic, copy) NSString * updateTime;
@end
NS_ASSUME_NONNULL_END
@@ -0,0 +1,12 @@
//
// UPAppVesionModel.m
// DoctorXinjiang
//
// Created by Apple on 2025/12/25.
//
#import "UPAppVesionModel.h"
@implementation UPAppVesionModel
@end
@@ -1,5 +1,5 @@
// //
// YXCancelReasonModel.h // XJDCancelReasonModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/17. // Created by 仁康信息 on 2023/8/17.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXCancelReasonModel : NSObject @interface XJDCancelReasonModel : NSObject
@property (nonatomic, strong) NSString * value; @property (nonatomic, strong) NSString * value;
@property (nonatomic, strong) NSString * text; @property (nonatomic, strong) NSString * text;
@@ -0,0 +1,12 @@
//
// XJDCancelReasonModel.m
// healthQuestion
//
// Created by 仁康信息 on 2023/8/17.
//
#import "XJDCancelReasonModel.h"
@implementation XJDCancelReasonModel
@end
@@ -1,5 +1,5 @@
// //
// YXDoctorInfoModel.h // XJDDoctorInfoModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/4. // Created by 仁康信息 on 2023/8/4.
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface YXDoctorGoodSicknessModel : NSObject @interface XJDDoctorGoodSicknessModel : NSObject
@property (nonatomic, copy) NSString * sicks_id; @property (nonatomic, copy) NSString * sicks_id;
@@ -20,13 +20,13 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface YXDoctorInfoModel : NSObject @interface XJDDoctorInfoModel : NSObject
@property (nonatomic, copy) NSString * doctor_Id; @property (nonatomic, copy) NSString * doctor_Id;
@property (nonatomic, copy) NSString * sex; @property (nonatomic, copy) NSString * sex;
@property (nonatomic, strong) NSArray<YXDoctorGoodSicknessModel *> * goodAtSicknessName; @property (nonatomic, strong) NSArray<XJDDoctorGoodSicknessModel *> * goodAtSicknessName;
@property (nonatomic, copy) NSString * doctorJob_dictText; @property (nonatomic, copy) NSString * doctorJob_dictText;
@@ -1,14 +1,14 @@
// //
// YXDoctorInfoModel.m // XJDDoctorInfoModel.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/8/4. // Created by on 2023/8/4.
// //
#import "YXDoctorInfoModel.h" #import "XJDDoctorInfoModel.h"
@implementation YXDoctorGoodSicknessModel @implementation XJDDoctorGoodSicknessModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {
@@ -19,7 +19,7 @@
@end @end
@implementation YXDoctorInfoModel @implementation XJDDoctorInfoModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {
@@ -33,7 +33,7 @@
{ {
return @{@"goodAtSicknessName":[YXDoctorGoodSicknessModel class], return @{@"goodAtSicknessName":[XJDDoctorGoodSicknessModel class],
}; };
} }
@@ -1,5 +1,5 @@
// //
// YXHomePageModel.h // XJDHomePageModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2022/9/9. // Created by 仁康信息 on 2022/9/9.
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXHomePageModel : NSObject @interface XJDHomePageModel : NSObject
@property (nonatomic, copy) NSString * imageName; @property (nonatomic, copy) NSString * imageName;
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface YXProjectModel : NSObject @interface XJDProjectModel : NSObject
@property (nonatomic, copy) NSString * imageName; @property (nonatomic, copy) NSString * imageName;
@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface YXZJSmallHelpModel : NSObject @interface XJDSmallHelpModel : NSObject
@property (nonatomic, copy) NSString * groupId; @property (nonatomic, copy) NSString * groupId;
@@ -1,24 +1,24 @@
// //
// YXHomePageModel.m // XJDHomePageModel.m
// healthQuestion // healthQuestion
// //
// Created by on 2022/9/9. // Created by on 2022/9/9.
// //
#import "YXHomePageModel.h" #import "XJDHomePageModel.h"
@implementation YXHomePageModel @implementation XJDHomePageModel
@end @end
@implementation YXProjectModel @implementation XJDProjectModel
@end @end
@implementation YXZJSmallHelpModel @implementation XJDSmallHelpModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {
@@ -1,5 +1,5 @@
// //
// YXHospitalModel.h // XJDHospitalModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2022/9/19. // Created by 仁康信息 on 2022/9/19.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXHospitalModel : NSObject @interface XJDHospitalModel : NSObject
@property (nonatomic, copy) NSString * hospitalName; @property (nonatomic, copy) NSString * hospitalName;
@@ -1,13 +1,13 @@
// //
// YXHospitalModel.m // XJDHospitalModel.m
// healthQuestion // healthQuestion
// //
// Created by on 2022/9/19. // Created by on 2022/9/19.
// //
#import "YXHospitalModel.h" #import "XJDHospitalModel.h"
@implementation YXHospitalModel @implementation XJDHospitalModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {
@@ -1,5 +1,5 @@
// //
// YXProjectListModel.h // XJDProjectListModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2022/10/12. // Created by 仁康信息 on 2022/10/12.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXSubProjectListModel : NSObject @interface XJDSubProjectListModel : NSObject
@property (nonatomic, copy) NSString * imageName; @property (nonatomic, copy) NSString * imageName;
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
@end @end
@interface YXProjectListModel : NSObject @interface XJDProjectListModel : NSObject
@property (nonatomic, assign) BOOL isShow; @property (nonatomic, assign) BOOL isShow;
@@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy) NSString * projectName; @property (nonatomic, copy) NSString * projectName;
@property (nonatomic, strong) NSArray<YXSubProjectListModel *>* subData; @property (nonatomic, strong) NSArray<XJDSubProjectListModel *>* subData;
@end @end
@@ -0,0 +1,27 @@
//
// XJDProjectListModel.m
// healthQuestion
//
// Created by 仁康信息 on 2022/10/12.
//
#import "XJDProjectListModel.h"
@implementation XJDSubProjectListModel
@end
@implementation XJDProjectListModel
+ (NSDictionary *)modelContainerPropertyGenericClass
{
return @{@"subData":[XJDSubProjectListModel class],
};
}
@end
@@ -1,5 +1,5 @@
// //
// YXQuestionBodyReportModel.h // XJDQuestionBodyReportModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/16. // Created by 仁康信息 on 2023/8/16.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionBodyReportModel : NSObject @interface XJDQuestionBodyReportModel : NSObject
@property (nonatomic, strong) NSString * insertdate; @property (nonatomic, strong) NSString * insertdate;
@property (nonatomic, strong) NSString * tjrq; @property (nonatomic, strong) NSString * tjrq;
@@ -0,0 +1,12 @@
//
// XJDQuestionBodyReportModel.m
// healthQuestion
//
// Created by 仁康信息 on 2023/8/16.
//
#import "XJDQuestionBodyReportModel.h"
@implementation XJDQuestionBodyReportModel
@end
@@ -1,5 +1,5 @@
// //
// YXQuestionRecordModel.h // XJDQuestionRecordModel.h
// healthQuestion // healthQuestion
// //
// Created by 仁康信息 on 2023/8/15. // Created by 仁康信息 on 2023/8/15.
@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface YXQuestionRecordModel : NSObject @interface XJDQuestionRecordModel : NSObject
@property (nonatomic, copy) NSString * record_id; @property (nonatomic, copy) NSString * record_id;
@property (nonatomic, copy) NSString * memberId; @property (nonatomic, copy) NSString * memberId;
@@ -1,13 +1,13 @@
// //
// YXQuestionRecordModel.m // XJDQuestionRecordModel.m
// healthQuestion // healthQuestion
// //
// Created by on 2023/8/15. // Created by on 2023/8/15.
// //
#import "YXQuestionRecordModel.h" #import "XJDQuestionRecordModel.h"
@implementation YXQuestionRecordModel @implementation XJDQuestionRecordModel
+ (NSDictionary *)modelCustomPropertyMapper + (NSDictionary *)modelCustomPropertyMapper
{ {

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