Skip to content

G
galaxy-iOS
Commit cb7fd7f1 authored by Steven杜宇's avatar Steven杜宇
1 Browse files
Options

Merge branch 'develop' into duyu 

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents e98bba03 8405c037
Hide whitespace changes
Inline Side-by-side
Showing with 366 additions and 60 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ cb7fd7f1
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
0468D42E2B5654A500CFB916 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42D2B5654A500CFB916 /* CoreTelephony.framework */; }; 0468D42E2B5654A500CFB916 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42D2B5654A500CFB916 /* CoreTelephony.framework */; };
0468D4302B5654B500CFB916 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */; }; 0468D4302B5654B500CFB916 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */; };
0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; }; 0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; };
0468D4342B56587B00CFB916 /* YHOOSManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4332B56587B00CFB916 /* YHOOSManager.swift */; }; 0468D4342B56587B00CFB916 /* YHOSSManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4332B56587B00CFB916 /* YHOSSManager.swift */; };
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; }; 0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4352B57752F00CFB916 /* YHUserModel.swift */; };
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; }; 0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
04808C062B4686510056D53C /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04808C042B4686510056D53C /* ATAuthSDK.bundle */; }; 04808C062B4686510056D53C /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04808C042B4686510056D53C /* ATAuthSDK.bundle */; };
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9112B4564F7002C94D2 /* YhOverlayView.swift */; }; A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9112B4564F7002C94D2 /* YhOverlayView.swift */; };
A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */; }; A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */; };
A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9132B4564F7002C94D2 /* YhConstant.swift */; }; A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9132B4564F7002C94D2 /* YhConstant.swift */; };
A5ACE9522B4564F7002C94D2 /* YHIntelligentServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9192B4564F7002C94D2 /* YHIntelligentServiceViewController.swift */; }; A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */; };
A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */; }; A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */; };
A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */; }; A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */; };
A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */; }; A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */; };
...@@ -94,6 +94,9 @@ ...@@ -94,6 +94,9 @@
A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9262B4564F7002C94D2 /* YHNoDataTipView.swift */; }; A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE9262B4564F7002C94D2 /* YHNoDataTipView.swift */; };
A5ACE95E2B4571BF002C94D2 /* YHHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE95D2B4571BF002C94D2 /* YHHomeViewController.swift */; }; A5ACE95E2B4571BF002C94D2 /* YHHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE95D2B4571BF002C94D2 /* YHHomeViewController.swift */; };
A5C382CA2B5E1F4C00C5E65C /* YHLoginTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */; }; A5C382CA2B5E1F4C00C5E65C /* YHLoginTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */; };
A5C382CC2B5EA11800C5E65C /* YHContractCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C382CB2B5EA11800C5E65C /* YHContractCell.swift */; };
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C382CE2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift */; };
A5C382D12B5FAAB300C5E65C /* YHContactItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C382D02B5FAAB300C5E65C /* YHContactItemModel.swift */; };
A5C5B2E62B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */; }; A5C5B2E62B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */; };
A5C5B2E82B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B2E72B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift */; }; A5C5B2E82B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B2E72B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift */; };
A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B2E92B4ECA4D00A7C5D1 /* YHDavidModel0.swift */; }; A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B2E92B4ECA4D00A7C5D1 /* YHDavidModel0.swift */; };
...@@ -165,7 +168,7 @@ ...@@ -165,7 +168,7 @@
0468D42C2B56549200CFB916 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; 0468D42C2B56549200CFB916 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
0468D42D2B5654A500CFB916 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; 0468D42D2B5654A500CFB916 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
0468D4332B56587B00CFB916 /* YHOOSManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOOSManager.swift; sourceTree = "<group>"; }; 0468D4332B56587B00CFB916 /* YHOSSManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOSSManager.swift; sourceTree = "<group>"; };
0468D4352B57752F00CFB916 /* YHUserModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHUserModel.swift; path = "galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift"; sourceTree = SOURCE_ROOT; }; 0468D4352B57752F00CFB916 /* YHUserModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHUserModel.swift; path = "galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift"; sourceTree = SOURCE_ROOT; };
0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginViewModel.swift; sourceTree = "<group>"; }; 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginViewModel.swift; sourceTree = "<group>"; };
04808C032B4686510056D53C /* ATAuthSDK_D.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK_D.framework; sourceTree = "<group>"; }; 04808C032B4686510056D53C /* ATAuthSDK_D.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK_D.framework; sourceTree = "<group>"; };
...@@ -229,7 +232,7 @@ ...@@ -229,7 +232,7 @@
A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhCacheTool.swift; sourceTree = "<group>"; }; A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhCacheTool.swift; sourceTree = "<group>"; };
A5ACE9132B4564F7002C94D2 /* YhConstant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhConstant.swift; sourceTree = "<group>"; }; A5ACE9132B4564F7002C94D2 /* YhConstant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YhConstant.swift; sourceTree = "<group>"; };
A5ACE9152B4564F7002C94D2 /* galaxy-Bridge-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "galaxy-Bridge-Header.h"; sourceTree = "<group>"; }; A5ACE9152B4564F7002C94D2 /* galaxy-Bridge-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "galaxy-Bridge-Header.h"; sourceTree = "<group>"; };
A5ACE9192B4564F7002C94D2 /* YHIntelligentServiceViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHIntelligentServiceViewController.swift; sourceTree = "<group>"; }; A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHServiceCenterMainViewController.swift; sourceTree = "<group>"; };
A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; }; A5ACE9202B4564F7002C94D2 /* YHBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHNavigationController.swift; sourceTree = "<group>"; }; A5ACE9212B4564F7002C94D2 /* YHNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHNavigationController.swift; sourceTree = "<group>"; };
A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHTabBarViewController.swift; sourceTree = "<group>"; }; A5ACE9222B4564F7002C94D2 /* YHTabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHTabBarViewController.swift; sourceTree = "<group>"; };
...@@ -238,6 +241,9 @@ ...@@ -238,6 +241,9 @@
A5ACE9262B4564F7002C94D2 /* YHNoDataTipView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHNoDataTipView.swift; sourceTree = "<group>"; }; A5ACE9262B4564F7002C94D2 /* YHNoDataTipView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHNoDataTipView.swift; sourceTree = "<group>"; };
A5ACE95D2B4571BF002C94D2 /* YHHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeViewController.swift; sourceTree = "<group>"; }; A5ACE95D2B4571BF002C94D2 /* YHHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeViewController.swift; sourceTree = "<group>"; };
A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginTipsView.swift; sourceTree = "<group>"; }; A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginTipsView.swift; sourceTree = "<group>"; };
A5C382CB2B5EA11800C5E65C /* YHContractCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractCell.swift; sourceTree = "<group>"; };
A5C382CE2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterMainViewModel.swift; sourceTree = "<group>"; };
A5C382D02B5FAAB300C5E65C /* YHContactItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContactItemModel.swift; sourceTree = "<group>"; };
A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDavidTestViewController.swift; sourceTree = "<group>"; }; A5C5B2E52B4EC0BF00A7C5D1 /* YHDavidTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDavidTestViewController.swift; sourceTree = "<group>"; };
A5C5B2E72B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDavidTestCollectionViewCell.swift; sourceTree = "<group>"; }; A5C5B2E72B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDavidTestCollectionViewCell.swift; sourceTree = "<group>"; };
A5C5B2E92B4ECA4D00A7C5D1 /* YHDavidModel0.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDavidModel0.swift; sourceTree = "<group>"; }; A5C5B2E92B4ECA4D00A7C5D1 /* YHDavidModel0.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDavidModel0.swift; sourceTree = "<group>"; };
...@@ -348,7 +354,7 @@ ...@@ -348,7 +354,7 @@
0468D4322B56581000CFB916 /* YHOOS */ = { 0468D4322B56581000CFB916 /* YHOOS */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
0468D4332B56587B00CFB916 /* YHOOSManager.swift */, 0468D4332B56587B00CFB916 /* YHOSSManager.swift */,
); );
path = YHOOS; path = YHOOS;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -636,6 +642,7 @@ ...@@ -636,6 +642,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A5C382C82B5E101E00C5E65C /* ServiceProcess(流程) */, A5C382C82B5E101E00C5E65C /* ServiceProcess(流程) */,
A5C382CD2B5F9A4F00C5E65C /* VM */,
A5ACE9172B4564F7002C94D2 /* M */, A5ACE9172B4564F7002C94D2 /* M */,
A5ACE9182B4564F7002C94D2 /* C */, A5ACE9182B4564F7002C94D2 /* C */,
A5ACE91A2B4564F7002C94D2 /* V */, A5ACE91A2B4564F7002C94D2 /* V */,
...@@ -646,6 +653,7 @@ ...@@ -646,6 +653,7 @@
A5ACE9172B4564F7002C94D2 /* M */ = { A5ACE9172B4564F7002C94D2 /* M */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A5C382D02B5FAAB300C5E65C /* YHContactItemModel.swift */,
); );
path = M; path = M;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -653,7 +661,7 @@ ...@@ -653,7 +661,7 @@
A5ACE9182B4564F7002C94D2 /* C */ = { A5ACE9182B4564F7002C94D2 /* C */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A5ACE9192B4564F7002C94D2 /* YHIntelligentServiceViewController.swift */, A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
); );
path = C; path = C;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -662,6 +670,7 @@ ...@@ -662,6 +670,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */, A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */,
A5C382CB2B5EA11800C5E65C /* YHContractCell.swift */,
); );
path = V; path = V;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -766,6 +775,14 @@ ...@@ -766,6 +775,14 @@
path = "ServiceProcess(流程)"; path = "ServiceProcess(流程)";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
A5C382CD2B5F9A4F00C5E65C /* VM */ = {
isa = PBXGroup;
children = (
A5C382CE2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
A5D6AB192B465DFF001C10A5 /* VM */ = { A5D6AB192B465DFF001C10A5 /* VM */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -982,8 +999,9 @@ ...@@ -982,8 +999,9 @@
A5ACE94A2B4564F7002C94D2 /* BsHUDProgressView.swift in Sources */, A5ACE94A2B4564F7002C94D2 /* BsHUDProgressView.swift in Sources */,
A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */, A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */,
0468D4282B50D4AF00CFB916 /* YHPrivacyAlertView.swift in Sources */, 0468D4282B50D4AF00CFB916 /* YHPrivacyAlertView.swift in Sources */,
0468D4342B56587B00CFB916 /* YHOOSManager.swift in Sources */, 0468D4342B56587B00CFB916 /* YHOSSManager.swift in Sources */,
A5ACE9522B4564F7002C94D2 /* YHIntelligentServiceViewController.swift in Sources */, A5C382D12B5FAAB300C5E65C /* YHContactItemModel.swift in Sources */,
A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */,
A5C5B2FD2B55361700A7C5D1 /* YHBannerModel.swift in Sources */, A5C5B2FD2B55361700A7C5D1 /* YHBannerModel.swift in Sources */,
A5ACE9462B4564F7002C94D2 /* BsHUDSquareBaseView.swift in Sources */, A5ACE9462B4564F7002C94D2 /* BsHUDSquareBaseView.swift in Sources */,
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */, A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */,
...@@ -1026,6 +1044,7 @@ ...@@ -1026,6 +1044,7 @@
A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */, A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,
A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */, A5ACE9482B4564F7002C94D2 /* BsHUDWariningView.swift in Sources */,
A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */, A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */,
A5C382CC2B5EA11800C5E65C /* YHContractCell.swift in Sources */,
A5ACE9492B4564F7002C94D2 /* BsHUDSuccessView.swift in Sources */, A5ACE9492B4564F7002C94D2 /* BsHUDSuccessView.swift in Sources */,
A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */, A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */,
A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */, A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,
...@@ -1033,6 +1052,7 @@ ...@@ -1033,6 +1052,7 @@
0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */, 0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */, A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
041B52982B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift in Sources */, 041B52982B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift in Sources */,
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */, A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */,
A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */, A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
A5C5B3292B57CCBE00A7C5D1 /* YHDavidCell4.swift in Sources */, A5C5B3292B57CCBE00A7C5D1 /* YHDavidCell4.swift in Sources */,
......
galaxy/galaxy/AppDelegate.swift
View file @ cb7fd7f1
...@@ -139,7 +139,7 @@ extension AppDelegate { ...@@ -139,7 +139,7 @@ extension AppDelegate {
private func setupRootVC() { private func setupRootVC() {
let tabBarController = YHTabBarViewController() let tabBarController = YHTabBarViewController()
let v0 = YHNavigationController(rootVC:YHHomeViewController()) let v0 = YHNavigationController(rootVC:YHHomeViewController())
let v1 = YHNavigationController(rootVC:YHIntelligentServiceViewController()) let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
let v2 = YHNavigationController(rootVC:YHMyViewController()) let v2 = YHNavigationController(rootVC:YHMyViewController())
v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "photo"), selectedImage: UIImage(named: "photo_1")) v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "photo"), selectedImage: UIImage(named: "photo_1"))
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHDavidTestViewController.swift
View file @ cb7fd7f1
...@@ -106,7 +106,7 @@ class YHDavidTestViewController: YHBaseViewController { ...@@ -106,7 +106,7 @@ class YHDavidTestViewController: YHBaseViewController {
view.backgroundColor = .white view.backgroundColor = .white
gk_navigationBar.isHidden = true gk_navigationBar.isHidden = true
self.items = [AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高")] self.items = [AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高"),AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高"),AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高"),AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高"),AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高"),AboutAdvantageItem(iconName: "about_match", title: "精准匹配", detail: "大数据精准匹配，专属方案获批率更高")]
self.myCollectView.reloadData() self.myCollectView.reloadData()
} }
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift
View file @ cb7fd7f1
...@@ -87,8 +87,8 @@ class YHHomeViewController: YHBaseViewController { ...@@ -87,8 +87,8 @@ class YHHomeViewController: YHBaseViewController {
tableView.separatorStyle = .none tableView.separatorStyle = .none
tableView.showsHorizontalScrollIndicator = false tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false tableView.showsVerticalScrollIndicator = false
// tableView.rowHeight = UITableView.automaticDimension // tableView.rowHeight = UITableView.automaticDimension
// tableView.estimatedRowHeight = 100 // tableView.estimatedRowHeight = 100
// tableView.register(YHHomeCustomCell.self, forCellReuseIdentifier: YHHomeCustomCell.cellReuseIdentifier) // tableView.register(YHHomeCustomCell.self, forCellReuseIdentifier: YHHomeCustomCell.cellReuseIdentifier)
tableView.register(YHDavidCell0.self,forCellReuseIdentifier: YHDavidCell0.cellReuseIdentifier) tableView.register(YHDavidCell0.self,forCellReuseIdentifier: YHDavidCell0.cellReuseIdentifier)
......
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @ cb7fd7f1
...@@ -30,6 +30,7 @@ extension YHHomePageViewModel { ...@@ -30,6 +30,7 @@ extension YHHomePageViewModel {
// printLog("model 是 ==> \(model)") // printLog("model 是 ==> \(model)")
let dic = model.data?.peel let dic = model.data?.peel
guard let resultModel = YHHomeCofigMode.deserialize(dict: dic as? [AnyHashable : Any]) else { guard let resultModel = YHHomeCofigMode.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return return
} }
configModel = resultModel configModel = resultModel
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHIntelligentServiceViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @ cb7fd7f1
...@@ -6,10 +6,12 @@ ...@@ -6,10 +6,12 @@
// //
import UIKit import UIKit
import SmartCodable //import SmartCodable
//服务中心 //服务中心
class YHIntelligentServiceViewController: YHBaseViewController { class YHServiceCenterMainViewController: YHBaseViewController {
private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
private lazy var topBkg : UIView = { private lazy var topBkg : UIView = {
let imagV = UIImageView() let imagV = UIImageView()
...@@ -33,12 +35,43 @@ class YHIntelligentServiceViewController: YHBaseViewController { ...@@ -33,12 +35,43 @@ class YHIntelligentServiceViewController: YHBaseViewController {
return view return view
}() }()
var homeTableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false
tableView.rowHeight = UITableView.automaticDimension
tableView.estimatedRowHeight = 81.0
tableView.register(YHContractCell.self,forCellReuseIdentifier: YHContractCell.cellReuseIdentifier)
return tableView
}()
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
initView() setupUI()
loadData()
}
}
extension YHServiceCenterMainViewController {
func loadData() {
self.serviceCenterMainReqVM.getContactList { success, error in
if success == true {
}
self.homeTableView.reloadData()
}
} }
func initView() { func setupUI() {
gk_navTitle = "服务中心" gk_navTitle = "服务中心"
gk_navBarAlpha = 1.0 gk_navBarAlpha = 1.0
...@@ -61,6 +94,58 @@ class YHIntelligentServiceViewController: YHBaseViewController { ...@@ -61,6 +94,58 @@ class YHIntelligentServiceViewController: YHBaseViewController {
make.centerY.equalToSuperview().offset(-64) make.centerY.equalToSuperview().offset(-64)
make.width.equalTo(KScreenWidth) make.width.equalTo(KScreenWidth)
} }
noDataView.isHidden = false
view.addSubview(homeTableView)
homeTableView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
make.bottom.equalToSuperview().offset(-k_Height_TabBar)
}
homeTableView.delegate = self
homeTableView.dataSource = self
}
}
// MARK: - UITableViewDelegate 和 UITableViewDataSource
extension YHServiceCenterMainViewController : UITableViewDelegate,UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
return self.serviceCenterMainReqVM.arrContactList.count
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 16
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 16))
return view
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
return 0
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
return UIView()
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHContractCell.cellReuseIdentifier, for: indexPath) as! YHContractCell
cell.selectionStyle = .none
if indexPath.section < self.serviceCenterMainReqVM.arrContactList.count {
cell.dataModel = self.serviceCenterMainReqVM.arrContactList[indexPath.section]
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
printLog("点击了 tableView Cell \(indexPath.row)")
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactItemModel.swift 0 → 100644
View file @ cb7fd7f1
//
// YHContactItemModel.swift
// galaxy
//
// Created by davidhuangA on 2024/1/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
struct YHContactItemModel : SmartCodable {
var id : String = ""
var orderSn : String = ""
var username : String = ""
var productName : String = ""
var createTime : String = ""
var type : String = ""
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractCell.swift 0 → 100644
View file @ cb7fd7f1
//
// YHContractCell.swift
// galaxy
//
// Created by davidhuangA on 2024/1/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHContractCell: UITableViewCell {
static let cellReuseIdentifier = "YHContractCell"
var dataModel : YHContactItemModel? {
didSet {
updateUI()
}
}
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
lazy var contractNameLable = {
let lable = UILabel()
lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
lable.font = kFont(name: "PingFangSC-Medium", size: 17)
lable.text = "香港优秀人才计划-张先生"
return lable
}()
lazy var contractIdLable = {
let lable = UILabel()
lable.font = kFont(name: "PingFangSC-Medium", size: 17)
lable.text = "订单号：10936"
lable.textColor = UIColor(red: 0.533, green: 0.561, blue: 0.596, alpha: 1)
lable.font = kFont(name: "PingFangSC-Regular", size: 12)
return lable
}()
}
extension YHContractCell {
func updateUI() {
contractNameLable.text = dataModel?.productName ?? "-"
contractIdLable.text = dataModel?.orderSn ?? "-"
}
func setupUI() {
let holdView = UIView()
holdView.backgroundColor = .white
holdView.layer.cornerRadius = 12
holdView.clipsToBounds = true
backgroundColor = .clear
contentView.backgroundColor = .clear
contentView.addSubview(holdView)
holdView.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
make.left.equalTo(16)
make.right.equalTo(-16)
}
let nextImgV = UIImageView()
nextImgV.image = UIImage(named: "service_center_right_next_icon")
nextImgV.contentMode = .scaleAspectFill
holdView.addSubview(nextImgV)
nextImgV.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(-16)
make.width.height.equalTo(16)
}
holdView.addSubview(contractNameLable)
contractNameLable.snp.makeConstraints { make in
make.top.equalTo(16)
make.left.equalTo(21)
make.right.equalTo(nextImgV.snp.left).offset(-10)
make.height.equalTo(24)
}
holdView.addSubview(contractIdLable)
contractIdLable.snp.makeConstraints { make in
make.top.equalTo(contractNameLable.snp.bottom).offset(4)
make.left.equalTo(contractNameLable)
make.right.equalTo(contractNameLable)
make.height.equalTo(20)
make.bottom.equalToSuperview().offset(-16)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift 0 → 100644
View file @ cb7fd7f1
//
// YHServiceCenterMainViewModel.swift
// galaxy
//
// Created by davidhuangA on 2024/1/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
class YHServiceCenterMainViewModel: YHBaseViewModel {
//合同列表 数据
var arrContactList : [YHContactItemModel] = []
}
extension YHServiceCenterMainViewModel {
//请求合同项
func getContactList(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.contractListApi
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
guard let model = NetBaseModel.deserialize(dict: json) else {
let error : YHErrorModel = YHErrorModel(errorCode:YHErrorCode.dictParseError.rawValue,errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
printLog("model 是 ==> \(model)")
let dic = model.data?.peel
guard let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
self.arrContactList = []
callBackBlock(false,nil)
return
}
self.arrContactList = resultModel.orders
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
}
}
}
struct YHContactItemHoldModel : SmartCodable {
var orders : [YHContactItemModel] = []
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ cb7fd7f1
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
class YHAllApiName { class YHAllApiName {
//接口 模块名 Common //接口 模块名 Common
struct Common { struct Common {
//具体的业务接口 //具体的业务接口
...@@ -17,16 +16,9 @@ class YHAllApiName { ...@@ -17,16 +16,9 @@ class YHAllApiName {
static let homeConfigApi = "common/homepage-config/index" static let homeConfigApi = "common/homepage-config/index"
} }
//order 模块
struct Order {
//接口 模块名 Common2 //合同列表
struct Common2 { static let contractListApi = "frontend/order/list"
//具体的业务接口
//首页配置接口
static let loginByPwd = "common/homepage-config/index"
} }
} }
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ cb7fd7f1
...@@ -12,7 +12,10 @@ class YHBaseUrlManager { ...@@ -12,7 +12,10 @@ class YHBaseUrlManager {
static let shared = YHBaseUrlManager() static let shared = YHBaseUrlManager()
//开发环境 //开发环境
static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/" // static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/"
static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
//正式环境 //正式环境
static let baseUrlRelease : String = "https://api.health.sleep321.com/" static let baseUrlRelease : String = "https://api.health.sleep321.com/"
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ cb7fd7f1
...@@ -90,6 +90,7 @@ class YHNetRequest: NSObject { ...@@ -90,6 +90,7 @@ class YHNetRequest: NSObject {
let appkey = "958364f87222c200a72414f492bf0e26" let appkey = "958364f87222c200a72414f492bf0e26"
let signOrgiString = "appid=" + "1" + "&" + "timestamp=" + dateStr + "&" + "appkey=" + appkey let signOrgiString = "appid=" + "1" + "&" + "timestamp=" + dateStr + "&" + "appkey=" + appkey
let sign = signOrgiString.md5() let sign = signOrgiString.md5()
print("sign = \(sign)")
requestHeader.add(name:"sign",value:sign) requestHeader.add(name:"sign",value:sign)
requestHeader.add(name: "token", value: "eyJpdiI6ImFheHNOa3dmYzZ0NUFSQzZUeDh2MVE9PSIsInZhbHVlIjoiblpTOVFWUFwvMHh4am5GUUxmaHkzTWUrZ1Roenk2QXp2V3FtbzJ2cHJSMXo2N2RnMGdpOG9JS3d3RlZtS1cweWhCcUpweVN6dGw5d2s2WldTRDdWODBhTGpFRWZmOFBiWDJib2lkSDNxSjJ2RXdRT2NhcXVLNGQ2ZjlFK1VIOTFRVjhld0F3eUk4amtcL0o1SDM5dm95TTB3RnZwcmVWaGZDU1FQckhCaGd6Y1cxMWNVUm5jRzZNOEhudWRrN1R1UzVreXR3YUhDeEdKNnhMbFlDNkIzendjVGJXRnFZbGpZUm1VRjltNHkxV0VXaUpHWTIwUVU3MjJCd3Z0YmgzTHNEOHRPTW5URks0T0lEdTFOYU5cL1lFZnJVdkpxRmpFSU9Dcms3R3NoQmlnbFRjY1ZpUFFtT0pDeE1SanpPemdoNFhSUUN0TkJ1V1VvXC9XWjdNSGVXMVNsVERHcThiM1dxVmZ1MlZrb3dDSUZLeFQ1SDBlcTl5NU1IUDJRQUtMeXZ4SnJOSjczWDhRWXZoZE1DVVIzclUzdEtNQkRRSHVRejNkSWpJNGZyUXVQOFlTbEd2Ujk1bjRKT3ZValltNXkwKzdTMCtJdDlRc015VDErMmdqQU52ejVcL0FLQ3BwdjJPQUZHeFozRjJKRzlINmxDTWdEcnQyaXZNaEVaZm1laXFMXC80TmJsblh0Q2JGWFVWRzhuWWF1SHc5SkFmMUdENExwR3FtRW1GTGpsZUcwNlFhbkdEU0dIZFQ5aU9FQlJWa2EzajRHOEt6NFwvXC9qNzhnWkpQOEFiOEIwbFdZWUVCcFd2YWZ4NHhcL1ZSOGZvaElnc3R2cVpFRG1GUTlwUEZwdFcxYnJEMjQ0Yk50bVd2ZU52cDlFZTBueEtmam55MUhLbDVlRjJGS0V3djlhQ1huZFU1QU1lYWZ6TEdQQ1wvK2V6VnFwSzJJeTVsZ2RCNE5qZkRRXC9GSzdvVkNcL1wvWUR2a2Q2NE5kVXBHYVloZDhtMlo1SHJFZnBITXlqWUQyZEVjQStGNGZiaXRPMVpJXC9ibDFXbG9HS21GSHhGVmNleG94UW9mQWhwY09qeDRJekpEQk9mMzZpdDNUSFwvUWpCa2xiYjlUcmRSdnZMTVpmajNkMU4zMk9mNWN3Mng2RlBWbEtYMGtwUDVZNjRsRlpTSmMyUWVMelo2K1J6R1VyYU9aYlVCMUFjZ2todm1kOWdcL3JUaXBCMjFleWliRTZhNDJ6d3dxb3llaHlSVmE4TjlkNCszMzJBbEdOY2N6ZE9zRW50K3VMUnV2d0xYMWtxM1RObkRiQTZDUGtpUHYzT01iQ2c1M1hxeEQ2RStTa3JRWUVpOGZ4d3lsOXpISTJzaGpLTHc0Z1NNZ0srRkdjbExET3drbFViVVdmRFhPVUZ2aU5VUkFqUTlkTUNDOHd4aUltUHNTSmtpWXlYMm9hY09JUCtGRlJ2amdYV2pIdEtBd2Frd1hEczA3Wk44T3FDY2t3dEk4RzhMMFJIK0x5WFB5cG9wTUR6dk9xdFZXVDk5eThFNmYzZ2IyTksyTGhDeHc4RlphTHBnc2ZJS2JRcWhtM1FYYm5TdFZLdnluYlZcL2N2TEYwYUNNOVNzMlpId0JKOXZSSEZ6d2tiQUdsdDErdkJYYXdvZnFsTTVnWFRNR1hcL2E2dXkrZ0h5bmRORFwvWW4yOVl1SHdZdjdra042bjBpUGIwWkJwZFZpMkY4RWtqTXpWT243Z0xBVGhLYzNiTStQSWhTQTNUV3BNSENTYXdYVGo0U0Y0WWlXTkRLdjBwend2Q3oySzJiUktKa1d2UlRrXC81emNwb0VEM3MzbFwvc3dLS0ZBcmxuaFladmtnXC9qb0JpOHFpYzlxeWNqVE5pYXNHbVcwajdnQUVPRngwK2xRdnZZOFdSXC9vb056UT09IiwibWFjIjoiN2MxYzYwYzFmMWY4ZmQyNjBjMjhjNTQ2ZGY2ZmY5NDE4MmRmN2IwNDg3ZWNmMWE1ZTk3YzhhMzFkNTBjYjhiMyJ9") requestHeader.add(name: "token", value: "eyJpdiI6ImFheHNOa3dmYzZ0NUFSQzZUeDh2MVE9PSIsInZhbHVlIjoiblpTOVFWUFwvMHh4am5GUUxmaHkzTWUrZ1Roenk2QXp2V3FtbzJ2cHJSMXo2N2RnMGdpOG9JS3d3RlZtS1cweWhCcUpweVN6dGw5d2s2WldTRDdWODBhTGpFRWZmOFBiWDJib2lkSDNxSjJ2RXdRT2NhcXVLNGQ2ZjlFK1VIOTFRVjhld0F3eUk4amtcL0o1SDM5dm95TTB3RnZwcmVWaGZDU1FQckhCaGd6Y1cxMWNVUm5jRzZNOEhudWRrN1R1UzVreXR3YUhDeEdKNnhMbFlDNkIzendjVGJXRnFZbGpZUm1VRjltNHkxV0VXaUpHWTIwUVU3MjJCd3Z0YmgzTHNEOHRPTW5URks0T0lEdTFOYU5cL1lFZnJVdkpxRmpFSU9Dcms3R3NoQmlnbFRjY1ZpUFFtT0pDeE1SanpPemdoNFhSUUN0TkJ1V1VvXC9XWjdNSGVXMVNsVERHcThiM1dxVmZ1MlZrb3dDSUZLeFQ1SDBlcTl5NU1IUDJRQUtMeXZ4SnJOSjczWDhRWXZoZE1DVVIzclUzdEtNQkRRSHVRejNkSWpJNGZyUXVQOFlTbEd2Ujk1bjRKT3ZValltNXkwKzdTMCtJdDlRc015VDErMmdqQU52ejVcL0FLQ3BwdjJPQUZHeFozRjJKRzlINmxDTWdEcnQyaXZNaEVaZm1laXFMXC80TmJsblh0Q2JGWFVWRzhuWWF1SHc5SkFmMUdENExwR3FtRW1GTGpsZUcwNlFhbkdEU0dIZFQ5aU9FQlJWa2EzajRHOEt6NFwvXC9qNzhnWkpQOEFiOEIwbFdZWUVCcFd2YWZ4NHhcL1ZSOGZvaElnc3R2cVpFRG1GUTlwUEZwdFcxYnJEMjQ0Yk50bVd2ZU52cDlFZTBueEtmam55MUhLbDVlRjJGS0V3djlhQ1huZFU1QU1lYWZ6TEdQQ1wvK2V6VnFwSzJJeTVsZ2RCNE5qZkRRXC9GSzdvVkNcL1wvWUR2a2Q2NE5kVXBHYVloZDhtMlo1SHJFZnBITXlqWUQyZEVjQStGNGZiaXRPMVpJXC9ibDFXbG9HS21GSHhGVmNleG94UW9mQWhwY09qeDRJekpEQk9mMzZpdDNUSFwvUWpCa2xiYjlUcmRSdnZMTVpmajNkMU4zMk9mNWN3Mng2RlBWbEtYMGtwUDVZNjRsRlpTSmMyUWVMelo2K1J6R1VyYU9aYlVCMUFjZ2todm1kOWdcL3JUaXBCMjFleWliRTZhNDJ6d3dxb3llaHlSVmE4TjlkNCszMzJBbEdOY2N6ZE9zRW50K3VMUnV2d0xYMWtxM1RObkRiQTZDUGtpUHYzT01iQ2c1M1hxeEQ2RStTa3JRWUVpOGZ4d3lsOXpISTJzaGpLTHc0Z1NNZ0srRkdjbExET3drbFViVVdmRFhPVUZ2aU5VUkFqUTlkTUNDOHd4aUltUHNTSmtpWXlYMm9hY09JUCtGRlJ2amdYV2pIdEtBd2Frd1hEczA3Wk44T3FDY2t3dEk4RzhMMFJIK0x5WFB5cG9wTUR6dk9xdFZXVDk5eThFNmYzZ2IyTksyTGhDeHc4RlphTHBnc2ZJS2JRcWhtM1FYYm5TdFZLdnluYlZcL2N2TEYwYUNNOVNzMlpId0JKOXZSSEZ6d2tiQUdsdDErdkJYYXdvZnFsTTVnWFRNR1hcL2E2dXkrZ0h5bmRORFwvWW4yOVl1SHdZdjdra042bjBpUGIwWkJwZFZpMkY4RWtqTXpWT243Z0xBVGhLYzNiTStQSWhTQTNUV3BNSENTYXdYVGo0U0Y0WWlXTkRLdjBwend2Q3oySzJiUktKa1d2UlRrXC81emNwb0VEM3MzbFwvc3dLS0ZBcmxuaFladmtnXC9qb0JpOHFpYzlxeWNqVE5pYXNHbVcwajdnQUVPRngwK2xRdnZZOFdSXC9vb056UT09IiwibWFjIjoiN2MxYzYwYzFmMWY4ZmQyNjBjMjhjNTQ2ZGY2ZmY5NDE4MmRmN2IwNDg3ZWNmMWE1ZTk3YzhhMzFkNTBjYjhiMyJ9")
...@@ -144,7 +145,7 @@ class YHNetRequest: NSObject { ...@@ -144,7 +145,7 @@ class YHNetRequest: NSObject {
httpRequest?.responseString(completionHandler: { string in httpRequest?.responseString(completionHandler: { string in
#if DEBUG #if DEBUG
// printLog("\n网络请求已返回 string=\(string)") printLog("\n网络请求已返回 string=\(string)")
#endif #endif
self.completeHandle(string: string) self.completeHandle(string: string)
}) })
...@@ -154,10 +155,8 @@ class YHNetRequest: NSObject { ...@@ -154,10 +155,8 @@ class YHNetRequest: NSObject {
/// 请求response完成处理 /// 请求response完成处理
func completeHandle(string: AFDataResponse<String>) { func completeHandle(string: AFDataResponse<String>) {
let responseResult = string.result let responseResult = string.result
let errorCodeStr = "0"
var statusCode = string.response?.statusCode ?? 0 var statusCode = string.response?.statusCode ?? 0
let errorResponseMsg = string.error?.localizedDescription ?? "" let errorResponseMsg = string.error?.localizedDescription ?? ""
_ = string.error?._code
let resultValue = string.value ?? "" let resultValue = string.value ?? ""
let serverDict = resultValue.toDictionary() let serverDict = resultValue.toDictionary()
switch responseResult { switch responseResult {
......
galaxy/galaxy/Classes/Tools/YHOOS/YHOOSManager.swift → galaxy/galaxy/Classes/Tools/YHOOS/YHOSSManager.swift
View file @ cb7fd7f1
...@@ -25,7 +25,7 @@ extension NSError : Error { ...@@ -25,7 +25,7 @@ extension NSError : Error {
public var _userInfo: AnyObject? { return userInfo as NSDictionary } public var _userInfo: AnyObject? { return userInfo as NSDictionary }
} }
class YHOOSDefine { class YHOSSDefine {
static let OSS_ACCESSKEY_ID: String = "access_key_id" static let OSS_ACCESSKEY_ID: String = "access_key_id"
static let OSS_SECRETKEY_ID: String = "access_key_secret" static let OSS_SECRETKEY_ID: String = "access_key_secret"
static let OSS_BUCKET_PUBLIC: String = "public-bucket" static let OSS_BUCKET_PUBLIC: String = "public-bucket"
...@@ -51,20 +51,20 @@ class YHOOSDefine { ...@@ -51,20 +51,20 @@ class YHOOSDefine {
static let OBJECT_KEY = "ObjectKey" static let OBJECT_KEY = "ObjectKey"
} }
class YHOOSManager: NSObject, URLSessionDelegate { class YHOSSManager: NSObject, URLSessionDelegate {
static let share = YHOOSManager() static let share = YHOSSManager()
var mProvider: OSSAuthCredentialProvider! var mProvider: OSSAuthCredentialProvider!
var mClient: OSSClient! var mClient: OSSClient!
override init() { override init() {
mProvider = OSSAuthCredentialProvider(authServerUrl: YHOOSDefine.OSS_STSTOKEN_URL) mProvider = OSSAuthCredentialProvider(authServerUrl: YHOSSDefine.OSS_STSTOKEN_URL)
mClient = OSSClient(endpoint: YHOOSDefine.OSS_ENDPOINT, credentialProvider: mProvider) mClient = OSSClient(endpoint: YHOSSDefine.OSS_ENDPOINT, credentialProvider: mProvider)
} }
func getObject() { func getObject() {
let getObjectReq: OSSGetObjectRequest = OSSGetObjectRequest() let getObjectReq: OSSGetObjectRequest = OSSGetObjectRequest()
getObjectReq.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE getObjectReq.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
getObjectReq.objectKey = YHOOSDefine.OSS_IMAGE_KEY getObjectReq.objectKey = YHOSSDefine.OSS_IMAGE_KEY
getObjectReq.downloadProgress = { (bytesWritten: Int64,totalBytesWritten : Int64, totalBytesExpectedToWrite: Int64) -> Void in getObjectReq.downloadProgress = { (bytesWritten: Int64,totalBytesWritten : Int64, totalBytesExpectedToWrite: Int64) -> Void in
printLog("bytesWritten:\(bytesWritten),totalBytesWritten:\(totalBytesWritten),totalBytesExpectedToWrite:\(totalBytesExpectedToWrite)") printLog("bytesWritten:\(bytesWritten),totalBytesWritten:\(totalBytesWritten),totalBytesExpectedToWrite:\(totalBytesExpectedToWrite)")
}; };
...@@ -80,7 +80,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -80,7 +80,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func getImage() { func getImage() {
let getObjectReq: OSSGetObjectRequest = OSSGetObjectRequest() let getObjectReq: OSSGetObjectRequest = OSSGetObjectRequest()
getObjectReq.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE getObjectReq.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
getObjectReq.objectKey = "ImageKey" getObjectReq.objectKey = "ImageKey"
getObjectReq.xOssProcess = "image/resize,m_lfit,w_100,h_100" getObjectReq.xOssProcess = "image/resize,m_lfit,w_100,h_100"
getObjectReq.downloadProgress = { (bytesWritten: Int64,totalBytesWritten : Int64, totalBytesExpectedToWrite: Int64) -> Void in getObjectReq.downloadProgress = { (bytesWritten: Int64,totalBytesWritten : Int64, totalBytesExpectedToWrite: Int64) -> Void in
...@@ -99,7 +99,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -99,7 +99,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func getStsToken() { func getStsToken() {
let tcs = OSSTaskCompletionSource<AnyObject>() let tcs = OSSTaskCompletionSource<AnyObject>()
let federationProvider: OSSFederationCredentialProvider = OSSFederationCredentialProvider(federationTokenGetter: {() ->OSSFederationToken? in let federationProvider: OSSFederationCredentialProvider = OSSFederationCredentialProvider(federationTokenGetter: {() ->OSSFederationToken? in
let url: URL = URL(string: YHOOSDefine.OSS_STSTOKEN_URL)! let url: URL = URL(string: YHOSSDefine.OSS_STSTOKEN_URL)!
let config: URLSessionConfiguration = URLSessionConfiguration.default let config: URLSessionConfiguration = URLSessionConfiguration.default
let session: URLSession = URLSession(configuration: config, delegate: self as URLSessionDelegate, delegateQueue: nil) let session: URLSession = URLSession(configuration: config, delegate: self as URLSessionDelegate, delegateQueue: nil)
...@@ -143,7 +143,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -143,7 +143,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
} }
let request = OSSHeadObjectRequest() let request = OSSHeadObjectRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectKey = objectKey request.objectKey = objectKey
let task: OSSTask = mClient.headObject(request) let task: OSSTask = mClient.headObject(request)
...@@ -156,7 +156,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -156,7 +156,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func getBucket() { func getBucket() {
let request = OSSGetBucketRequest() let request = OSSGetBucketRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
let task = mClient.getBucket(request) let task = mClient.getBucket(request)
task.continue( { (t) -> Any? in task.continue( { (t) -> Any? in
...@@ -171,7 +171,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -171,7 +171,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func getBucketACL() -> Void { func getBucketACL() -> Void {
let request = OSSGetBucketACLRequest() let request = OSSGetBucketACLRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
let task = mClient.getBucketACL(request) let task = mClient.getBucketACL(request)
task.continue( { (t) -> Any? in task.continue( { (t) -> Any? in
...@@ -209,7 +209,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -209,7 +209,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func putObject(image: UIImage) { func putObject(image: UIImage) {
let request = OSSPutObjectRequest() let request = OSSPutObjectRequest()
request.uploadingData = image.pngData()! request.uploadingData = image.pngData()!
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectKey = "landscape-painting.jpeg" request.objectKey = "landscape-painting.jpeg"
request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)") printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
...@@ -244,7 +244,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -244,7 +244,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
userInfo: [OSSErrorMessageTOKEN : "Can not get FederationToken."]) userInfo: [OSSErrorMessageTOKEN : "Can not get FederationToken."])
} }
let client = OSSClient(endpoint: YHOOSDefine.OSS_ENDPOINT, credentialProvider: provider) let client = OSSClient(endpoint: YHOSSDefine.OSS_ENDPOINT, credentialProvider: provider)
let task = client.putObject(request) let task = client.putObject(request)
task.continue({ (t) -> Any? in task.continue({ (t) -> Any? in
self.showResult(task: t) self.showResult(task: t)
...@@ -254,15 +254,15 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -254,15 +254,15 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func multipartUpload() { func multipartUpload() {
let request = OSSMultipartUploadRequest() let request = OSSMultipartUploadRequest()
request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")! request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")!
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectKey = "wangwang(swift).zip" request.objectKey = "wangwang(swift).zip"
request.partSize = 102400; request.partSize = 102400;
request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in request.uploadProgress = { (bytesSent: Int64, totalBytesSent: Int64, totalBytesExpectedToSend: Int64) -> Void in
printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)") printLog("bytesSent:\(bytesSent),totalBytesSent:\(totalBytesSent),totalBytesExpectedToSend:\(totalBytesExpectedToSend)")
}; };
let provider = OSSAuthCredentialProvider(authServerUrl: YHOOSDefine.OSS_STSTOKEN_URL) let provider = OSSAuthCredentialProvider(authServerUrl: YHOSSDefine.OSS_STSTOKEN_URL)
let client = OSSClient(endpoint: YHOOSDefine.OSS_ENDPOINT, credentialProvider: provider) let client = OSSClient(endpoint: YHOSSDefine.OSS_ENDPOINT, credentialProvider: provider)
let task = client.multipartUpload(request) let task = client.multipartUpload(request)
task.continue({ (t) -> Any? in task.continue({ (t) -> Any? in
self.showResult(task: t) self.showResult(task: t)
...@@ -271,7 +271,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -271,7 +271,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func sequentialMultipartUpload() { func sequentialMultipartUpload() {
let request = OSSResumableUploadRequest() let request = OSSResumableUploadRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE; request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE;
request.objectKey = "sequential-swift-multipart" request.objectKey = "sequential-swift-multipart"
request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")! request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")!
request.deleteUploadIdOnCancelling = false request.deleteUploadIdOnCancelling = false
...@@ -289,7 +289,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -289,7 +289,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func resumableUpload() { func resumableUpload() {
var request = OSSResumableUploadRequest() var request = OSSResumableUploadRequest()
request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")! request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")!
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.deleteUploadIdOnCancelling = false request.deleteUploadIdOnCancelling = false
request.objectKey = "wangwang(swift).zip" request.objectKey = "wangwang(swift).zip"
let cacheDir = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory, FileManager.SearchPathDomainMask.userDomainMask, true).first let cacheDir = NSSearchPathForDirectoriesInDomains(FileManager.SearchPathDirectory.cachesDirectory, FileManager.SearchPathDomainMask.userDomainMask, true).first
...@@ -310,7 +310,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -310,7 +310,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
request = OSSResumableUploadRequest() request = OSSResumableUploadRequest()
request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")! request.uploadingFileURL = Bundle.main.url(forResource: "wangwang", withExtension: "zip")!
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectKey = "wangwang(swift).zip" request.objectKey = "wangwang(swift).zip"
request.partSize = 102400; request.partSize = 102400;
request.deleteUploadIdOnCancelling = false request.deleteUploadIdOnCancelling = false
...@@ -329,7 +329,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -329,7 +329,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func putObjectWithXML() { func putObjectWithXML() {
let request = OSSPutObjectRequest() let request = OSSPutObjectRequest()
request.uploadingFileURL = Bundle.main.url(forResource: "test", withExtension: "xml")! request.uploadingFileURL = Bundle.main.url(forResource: "test", withExtension: "xml")!
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectKey = "test.xml" request.objectKey = "test.xml"
request.contentSHA1 = OSSUtil.sha1(withFilePath: Bundle.main.path(forResource: "test", ofType: "xml")) request.contentSHA1 = OSSUtil.sha1(withFilePath: Bundle.main.path(forResource: "test", ofType: "xml"))
...@@ -345,8 +345,8 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -345,8 +345,8 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func getObjectACL() { func getObjectACL() {
let request = OSSGetObjectACLRequest() let request = OSSGetObjectACLRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectName = YHOOSDefine.OSS_IMAGE_KEY request.objectName = YHOSSDefine.OSS_IMAGE_KEY
let task = mClient.getObjectACL(request) let task = mClient.getObjectACL(request)
task.continue({ (t) -> Any? in task.continue({ (t) -> Any? in
...@@ -358,7 +358,7 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -358,7 +358,7 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func deleteMultipleObjects() { func deleteMultipleObjects() {
let request = OSSDeleteMultipleObjectsRequest() let request = OSSDeleteMultipleObjectsRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.keys = ["testFor5m"] request.keys = ["testFor5m"]
request.quiet = false request.quiet = false
request.encodingType = "url" request.encodingType = "url"
...@@ -373,14 +373,14 @@ class YHOOSManager: NSObject, URLSessionDelegate { ...@@ -373,14 +373,14 @@ class YHOOSManager: NSObject, URLSessionDelegate {
func triggerCallBack() { func triggerCallBack() {
let provider = OSSPlainTextAKSKPairCredentialProvider.init(plainTextAccessKey: "AK", secretKey: "SK") let provider = OSSPlainTextAKSKPairCredentialProvider.init(plainTextAccessKey: "AK", secretKey: "SK")
let pClient = OSSClient.init(endpoint: YHOOSDefine.OSS_ENDPOINT, credentialProvider: provider) let pClient = OSSClient.init(endpoint: YHOSSDefine.OSS_ENDPOINT, credentialProvider: provider)
let request = OSSCallBackRequest() let request = OSSCallBackRequest()
request.bucketName = YHOOSDefine.OSS_BUCKET_PRIVATE request.bucketName = YHOSSDefine.OSS_BUCKET_PRIVATE
request.objectName = "file1m" request.objectName = "file1m"
request.callbackVar = ["key1": "value1", request.callbackVar = ["key1": "value1",
"key2": "value2"] "key2": "value2"]
request.callbackParam = ["callbackUrl": YHOOSDefine.OSS_CALLBACK_URL, request.callbackParam = ["callbackUrl": YHOSSDefine.OSS_CALLBACK_URL,
"callbackBody": "test"] "callbackBody": "test"]
let task = pClient.triggerCallBack(request) let task = pClient.triggerCallBack(request)
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_right_next_icon.imageset/Contents.json 0 → 100644
View file @ cb7fd7f1
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon-展开@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon-展开@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment