【会员系统】密码验证格式补充

PDF Office/PDF Master/MemberCenter/Model/KMMemberCenterManager.swift

@@ -241,17 +241,29 @@ class KMMemberCenterManager: NSObject {
      @abstract 邮箱验证码登录 & 密码登录
      @param email 邮箱
      @param code 验证码/密码
+     @param type 密码类型（验证码？密码？）
      @param complete 回调
      */
-    func emailLogin(email: String, code: String, _ complete: @escaping KMMemberCenterComplete) {
+    func emailLogin(email: String, code: String, type: KMSignUpState, _ complete: @escaping KMMemberCenterComplete) {
         let urlString = configuration.activityBaseURL() + "/member-system-sso/auth/memberLogin"
         let uuid: String = GetHardwareUUID() ?? ""
-        let params: [String: Any] = ["email": email,
-                                     "code": code,
-                                     "appId": "1",
-                                     "deviceSign": uuid,
-                                     "deviceName": NSFullUserName(),
-                                     "model": "mac"]
+        var params: [String: Any] = [:]
+        if type == .verificationCode {
+            params = ["email": email,
+                      "code": code,
+                      "appId": "1",
+                      "deviceSign": uuid,
+                      "deviceName": NSFullUserName(),
+                      "model": "mac"]
+        } else {
+            params = ["email": email,
+                      "password": code,
+                      "appId": "1",
+                      "deviceSign": uuid,
+                      "deviceName": NSFullUserName(),
+                      "model": "mac"]
+        }
+        
         KMRequestServer.requestServer.request(urlString: urlString, method: .post, params: params) { requestSerializer in
 //            requestSerializer.setValue("Apifox/1.0.0 (https://www.apifox.cn)", forHTTPHeaderField: "User-Agent")
         } completion: { [weak self] (task, responseObject, error) in

PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib

@@ -347,8 +347,8 @@
                                             <rect key="frame" x="0.0" y="0.0" width="277" height="26"/>
                                             <subviews>
                                                 <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AGE-IA-Gl4">
-                                                    <rect key="frame" x="8" y="5" width="243" height="16"/>
-                                                    <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" drawsBackground="YES" usesSingleLineMode="YES" id="QCj-QO-AzJ">
+                                                    <rect key="frame" x="6" y="5" width="247" height="16"/>
+                                                    <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="QCj-QO-AzJ">
                                                         <font key="font" metaFont="system"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

PDF Office/PDF Master/MemberCenter/ViewModel/KMSignUpViewModel.swift

@@ -162,7 +162,7 @@ class KMSignUpViewModel: ObservableObject {
      @param
      */
     func signUpAction() -> Void {
-        if email.count <= 0 {
+        if email.count <= 0 || email.count > 100 {
             emailErrorMessage = NSLocalizedString("Please enter the correct email format", tableName: "MemberCenterLocalizable", comment: "")
             return
         }
@@ -171,7 +171,7 @@ class KMSignUpViewModel: ObservableObject {
             return
         }
         
-        var code = password
+        var code: String = ""
         if signUpState == .verificationCode {
             if verificationCode.count <= 0 {
                 passwordErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
@@ -187,8 +187,9 @@ class KMSignUpViewModel: ObservableObject {
                 passwordErrorMessage = NSLocalizedString("*Please enter right Verification code", tableName: "MemberCenterLocalizable", comment: "")
                 return
             }
+            code = password
         }
-        KMMemberCenterManager.manager.emailLogin(email: email, code: code) { [weak self] success, wrapper  in
+        KMMemberCenterManager.manager.emailLogin(email: email, code: code, type: signUpState) { [weak self] success, wrapper  in
             guard let self = self else { return }
             let resultDict = wrapper! as KMMemberCenterResult
             let msg = resultDict.msg