提交内容

1、代码提交；

MTP_iOS/MTP2_iOS.xcodeproj/project.pbxproj

@@ -2776,7 +2776,7 @@
 				CODE_SIGN_ENTITLEMENTS = MTP2_iOS/BPML.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1100;
+				CURRENT_PROJECT_VERSION = 1110;
 				DEVELOPMENT_TEAM = QF38M2SZT9;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2800,7 +2800,7 @@
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/WeChat",
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/UMSPosPayOnly",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LIBTOOLFLAGS = "$(inherited)";
@@ -2827,7 +2827,7 @@
 				CODE_SIGN_ENTITLEMENTS = MTP2_iOS/BPML.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1100;
+				CURRENT_PROJECT_VERSION = 1110;
 				DEVELOPMENT_TEAM = QF38M2SZT9;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2851,7 +2851,7 @@
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/WeChat",
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/UMSPosPayOnly",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",

MTP_iOS/MTP2_iOS/BusinessCore/Account/Models/AccountModels.swift

@@ -336,4 +336,6 @@ struct MoAddress: HandyJSON {
     var tradePort = ""
     /// 文件上传地址
     var uploadUrl = ""
+    /// 海商提现时间信息
+    var hsbyBankSignZone = ""
 }

MTP_iOS/MTP2_iOS/Info.plist

@@ -78,13 +78,11 @@
 		<true/>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>该app需要得到您给予相机的权限</string>
-	<key>NSContactsUsageDescription</key>
-	<string>权限申请</string>
+	<string>该App需要访问您的相机权限，用来上传证件照信息审核客户资质信息！</string>
 	<key>NSMicrophoneUsageDescription</key>
-	<string>权限申请</string>
+	<string>该App需要访问您的麦克风使用权限，用来录制视频上传提升审核客户资质信息！</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>该app需要得到您给予相册的权限</string>
+	<string>该App需要访问您的相册权限，用来上传证件照信息审核客户资质信息！</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -110,7 +108,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>kTCCServiceMediaLibrary</key>
-	<string>该app需要您的同意,才能访问媒体资料库</string>
 </dict>
 </plist>

MTP_iOS/MTP2_iOS/UserInterface/Mine/OutInMoney/OutMoneyViewController.swift

@@ -119,9 +119,9 @@ class OutMoneyViewController: BaseViewController {
         accountNameTextField.text = accountManager.moAccountBaseInfo?.accountInfo.customerName
         
         outMoneyAmountTextField.addTarget(self, action: #selector(calCusBankCharge), for: .editingChanged)
-        if let configInfo = accountManager.configInfo,
-           let signTime = configInfo["012"]?.paramValue,
-           let outTime = configInfo["013"]?.paramValue {
+        if let configInfo = MTP2BusinessCore.shared.address?.hsbyBankSignZone.components(separatedBy: "-"),
+           let signTime = configInfo.first,
+           let outTime = configInfo.last {
             bankOutMoneyTipMessage.text = "银行出金时间段：\(signTime) - \(outTime)"
         } else {
             bankOutMoneyTipMessage.isHidden = true
@@ -273,6 +273,16 @@ class OutMoneyViewController: BaseViewController {
     
     /// 校验数据
     func checkValue() -> Bool {
+        
+        let now = Date().getString(formatter: "HH:mm")
+        guard let configInfo = MTP2BusinessCore.shared.address?.hsbyBankSignZone.components(separatedBy: "-"),
+           let signTime = configInfo.first,
+           let outTime = configInfo.last, now>signTime,
+           now<outTime else  {
+            self.showHintController(title: "提示", message: "请在规定的时间段内进行提现！", handler: nil)
+            return false
+        }
+        
         /// 出金金额
         if let outMoneyAmount = self.outMoneyAmountTextField.text {
             if outMoneyAmount.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {