Переглянути джерело

【会员系统】会员系统夜间模式适配

wangshuai 4 місяців тому
батько
коміт
888ac76555
38 змінених файлів з 348 додано та 116 видалено
  1. 2 1
      PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m
  2. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000.colorset/Contents.json
  3. 38 0
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.05.colorset/Contents.json
  4. 4 4
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.1.colorset/Contents.json
  5. 38 0
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.76.colorset/Contents.json
  6. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.85.colorset/Contents.json
  7. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/0E1114.colorset/Contents.json
  8. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/273C62.colorset/Contents.json
  9. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/273C62_0.4.colorset/Contents.json
  10. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/42464D.colorset/Contents.json
  11. 38 0
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/42464D_1.colorset/Contents.json
  12. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/4982E6.colorset/Contents.json
  13. 3 3
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/DADBDE.colorset/Contents.json
  14. 6 6
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/FA1E5D.colorset/Contents.json
  15. 38 0
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/membercentercolor.colorset/Contents.json
  16. 38 0
      PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/texefiedfillcolor.colorset/Contents.json
  17. 3 1
      PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings
  18. 4 1
      PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.swift
  19. 8 8
      PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.xib
  20. 4 1
      PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.swift
  21. 7 7
      PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.xib
  22. 4 1
      PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.swift
  23. 1 1
      PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.xib
  24. 5 3
      PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift
  25. 17 17
      PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib
  26. 14 13
      PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift
  27. 2 2
      PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.xib
  28. 4 4
      PDF Office/PDF Master/MemberCenter/ViewModel/KMUserInfoVCModel.swift
  29. 12 1
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.swift
  30. 4 4
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.xib
  31. 3 0
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.swift
  32. 4 4
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.xib
  33. 7 2
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.swift
  34. 4 4
      PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.xib
  35. 1 0
      PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.swift
  36. 2 2
      PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.xib
  37. 8 1
      PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.swift
  38. 4 4
      PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.xib

+ 2 - 1
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -788,7 +788,8 @@ NSPopoverDelegate>
     // 用户头像点击事件
     self.userMenu = [[NSMenu alloc] init];
     KMUserInfoViewController *userInfo = [[KMUserInfoViewController alloc] init];
-    userInfo.view.layer.backgroundColor = [NSColor whiteColor].CGColor;
+    NSColor *color = [NSColor colorNamed:@"membercentercolor"];
+    userInfo.view.layer.backgroundColor = color.CGColor;
     NSMenuItem *item = [self.userMenu addItemWithTitle:@"" action:nil target:@""];
     item.target = self;
     item.representedObject = userInfo;

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

+ 38 - 0
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.05.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.050",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.300",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 4 - 4
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.1.colorset/Contents.json

@@ -22,10 +22,10 @@
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "alpha" : "0.100",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
+          "alpha" : "1.000",
+          "blue" : "0x98",
+          "green" : "0x58",
+          "red" : "0x36"
         }
       },
       "idiom" : "universal"

+ 38 - 0
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.76.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "236",
+          "green" : "236",
+          "red" : "236"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/000000_0.85.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "0.850",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/0E1114.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x14",
-          "green" : "0x11",
-          "red" : "0x0E"
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/273C62.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x62",
-          "green" : "0x3C",
-          "red" : "0x27"
+          "blue" : "0xDB",
+          "green" : "0x7F",
+          "red" : "0x4E"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/273C62_0.4.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "0.400",
-          "blue" : "0x62",
-          "green" : "0x3C",
-          "red" : "0x27"
+          "blue" : "0xDB",
+          "green" : "0x7F",
+          "red" : "0x4E"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/42464D.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x4D",
-          "green" : "0x46",
-          "red" : "0x42"
+          "blue" : "0xCC",
+          "green" : "0xC9",
+          "red" : "0xC8"
         }
       },
       "idiom" : "universal"

+ 38 - 0
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/42464D_1.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x4D",
+          "green" : "0x46",
+          "red" : "0x42"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x85",
+          "green" : "0x7F",
+          "red" : "0x7E"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/4982E6.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xE6",
-          "green" : "0x82",
-          "red" : "0x49"
+          "blue" : "0xFF",
+          "green" : "0x7A",
+          "red" : "0x22"
         }
       },
       "idiom" : "universal"

+ 3 - 3
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/DADBDE.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xDE",
-          "green" : "0xDB",
-          "red" : "0xDA"
+          "blue" : "0x5A",
+          "green" : "0x58",
+          "red" : "0x56"
         }
       },
       "idiom" : "universal"

+ 6 - 6
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/FA1E5D.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x5D",
-          "green" : "0x1E",
-          "red" : "0xFA"
+          "blue" : "0x5B",
+          "green" : "0x46",
+          "red" : "0xF3"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x5D",
-          "green" : "0x1E",
-          "red" : "0xFA"
+          "blue" : "0x61",
+          "green" : "0x38",
+          "red" : "0xE7"
         }
       },
       "idiom" : "universal"

+ 38 - 0
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/membercentercolor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x14",
+          "green" : "0x11",
+          "red" : "0x0E"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 38 - 0
PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Color/texefiedfillcolor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x3E",
+          "green" : "0x3C",
+          "red" : "0x39"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

+ 3 - 1
PDF Office/PDF Master/MemberCenter/Assets/zh-Hans.lproj/MemberCenterLocalizable.strings

@@ -21,7 +21,7 @@
 "Privacy Policy" = "隐私政策";
 "Please agree and check the above agreement first." = "请先同意并勾选上述协议。";
 "Forgot password?" = "忘记密码?";
-"Please enter password" = "P请输入密码";
+"Please enter password" = "请输入密码";
 "Email format error. Please enter the correct email." = "邮箱格式错误,请输入正确邮箱。";
 "Resend" = "重新发送";
 "Verification code error." = "验证码错误";
@@ -30,6 +30,8 @@
 "Next" = "下一步";
 "Previous Step" = "返回";
 "This email has not been registered, please log in through the account verification code, we will automatically register an account for you." = "此邮箱未注册,请通过账号验证码登录,我们会自动为您注册账号。";
+"We have sent you a code via email to" = "验证码已通过邮件发送至";
+
 "Please enter a new password" = "请输入新密码";
 "Finish" = "完成";
 "Sign out" = "退出登录";

+ 4 - 1
PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.swift

@@ -62,6 +62,9 @@ class KMEnterNewPasswordView: KMBaseXibView {
         passwordTextField.delegate = self
         passwordTextField1.delegate = self
         
+        passwordBox.fillColor = NSColor(named: "texefiedfillcolor") ?? NSColor.white
+        passwordBox.borderColor = NSColor(named: "DADBDE") ?? NSColor.gray
+
 //        passwordTextField.stringValue = viewModel.password
 //        passwordTextField1.stringValue = viewModel.password
         passwordErrorLabel.isHidden = !viewModel.passwordError()
@@ -72,7 +75,7 @@ class KMEnterNewPasswordView: KMBaseXibView {
         passwordErrorLabel.textColor = NSColor(named: "FA1E5D")
         passwordErrorLabel.font = NSFont.SFProTextRegularFont(9)
         finshBox.fillColor = NSColor(named: "273C62") ?? NSColor.blue
-        finshButton.setTitleColor(color: NSColor(named: "FFFFFF") ?? NSColor.white, font: NSFont.SFProTextRegularFont(16))
+        finshButton.setTitleColor(color: NSColor(named: "FFFFFF") ?? NSColor.white, font: NSFont.SFProTextRegularFont(13))
     }
 
     private func visibleStateChange() -> Void {

+ 8 - 8
PDF Office/PDF Master/MemberCenter/View/KMEnterNewPasswordView.xib

@@ -26,13 +26,13 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="ZRz-aH-GEE">
-                    <rect key="frame" x="46" y="156" width="279" height="132"/>
+                    <rect key="frame" x="46" y="155" width="279" height="134"/>
                     <view key="contentView" id="Bfc-fj-lKa">
-                        <rect key="frame" x="0.0" y="0.0" width="279" height="132"/>
+                        <rect key="frame" x="0.0" y="0.0" width="279" height="134"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="qdj-L6-DZD">
-                                <rect key="frame" x="0.0" y="108" width="279" height="24"/>
+                                <rect key="frame" x="0.0" y="110" width="279" height="24"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aJo-ll-hmw">
                                         <rect key="frame" x="-2" y="0.0" width="52" height="24"/>
@@ -78,7 +78,7 @@
                                 </constraints>
                             </box>
                             <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="bNK-ST-ALL">
-                                <rect key="frame" x="0.0" y="56" width="279" height="28"/>
+                                <rect key="frame" x="0.0" y="58" width="279" height="28"/>
                                 <view key="contentView" id="bPs-xE-mfj">
                                     <rect key="frame" x="1" y="1" width="277" height="26"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -100,7 +100,7 @@
                                                 <textField hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I9E-f1-hFQ">
                                                     <rect key="frame" x="6" y="6" width="247" height="14"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="Yxo-Qm-Gcx">
-                                                        <font key="font" metaFont="system" size="11"/>
+                                                        <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -146,7 +146,7 @@
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qlQ-Xr-lw9">
                                 <rect key="frame" x="-2" y="41" width="283" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="EhP-4f-hOw">
-                                    <font key="font" metaFont="system" size="12"/>
+                                    <font key="font" metaFont="cellTitle"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
@@ -155,7 +155,7 @@
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="8oD-pe-ETb" secondAttribute="trailing" id="70r-yP-z2W"/>
                             <constraint firstItem="bNK-ST-ALL" firstAttribute="top" secondItem="qdj-L6-DZD" secondAttribute="bottom" constant="24" id="Bb4-FV-GBq"/>
-                            <constraint firstItem="qlQ-Xr-lw9" firstAttribute="top" secondItem="bNK-ST-ALL" secondAttribute="bottom" id="C0J-oF-I7R"/>
+                            <constraint firstItem="qlQ-Xr-lw9" firstAttribute="top" secondItem="bNK-ST-ALL" secondAttribute="bottom" constant="2" id="C0J-oF-I7R"/>
                             <constraint firstItem="qdj-L6-DZD" firstAttribute="leading" secondItem="Bfc-fj-lKa" secondAttribute="leading" id="HrC-zc-YCf"/>
                             <constraint firstItem="qlQ-Xr-lw9" firstAttribute="leading" secondItem="Bfc-fj-lKa" secondAttribute="leading" id="VIc-0W-i21"/>
                             <constraint firstItem="bNK-ST-ALL" firstAttribute="leading" secondItem="Bfc-fj-lKa" secondAttribute="leading" id="f0R-aG-PrX"/>
@@ -168,7 +168,7 @@
                         </constraints>
                     </view>
                     <constraints>
-                        <constraint firstAttribute="height" constant="132" id="aue-yR-55M"/>
+                        <constraint firstAttribute="height" constant="134" id="aue-yR-55M"/>
                         <constraint firstAttribute="width" constant="279" id="h7X-Hs-iiQ"/>
                     </constraints>
                 </box>

+ 4 - 1
PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.swift

@@ -93,6 +93,9 @@ class KMEnterVerificationCodeView: KMBaseXibView {
     }
     
     private func initializeUI() -> Void {
+        verifficationBox.fillColor = NSColor(named: "texefiedfillcolor") ?? NSColor.white
+        verifficationBox.borderColor = NSColor(named: "DADBDE") ?? NSColor.gray
+
         verifficationTextField.delegate = self
 
         resetPasswordsLabel.textColor = NSColor(named: "000000")
@@ -106,7 +109,7 @@ class KMEnterVerificationCodeView: KMBaseXibView {
         verifficationErrorLabel.textColor = NSColor(named: "FA1E5D")
         verifficationErrorLabel.font = NSFont.SFProTextRegularFont(9)
         nextBox.fillColor = NSColor(named: "273C62") ?? NSColor.blue
-        nextButton.setTitleColor(color: NSColor(named: "FFFFFF") ?? NSColor.white, font: NSFont.SFProTextRegularFont(16))
+        nextButton.setTitleColor(color: NSColor(named: "FFFFFF") ?? NSColor.white, font: NSFont.SFProTextRegularFont(13))
         backButton.setTitleColor(color: NSColor(named: "4982E6") ?? NSColor.blue, font: NSFont.SFProTextRegularFont(12))
     }
 

+ 7 - 7
PDF Office/PDF Master/MemberCenter/View/KMEnterVerificationCodeView.xib

@@ -94,8 +94,8 @@
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LZA-oE-Mth">
                                         <rect key="frame" x="-2" y="-1" width="283" height="15"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="oxN-El-oBZ">
-                                            <font key="font" metaFont="system" size="12"/>
+                                        <textFieldCell key="cell" lineBreakMode="truncatingMiddle" title="Label" id="oxN-El-oBZ">
+                                            <font key="font" metaFont="cellTitle"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -120,7 +120,7 @@
                                                 <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3WV-H8-R9L">
                                                     <rect key="frame" x="6" y="6" width="214" height="14"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="Fux-Lx-ckR">
-                                                        <font key="font" metaFont="system" size="11"/>
+                                                        <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -144,7 +144,7 @@
                                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EBN-jV-4Nt">
                                                     <rect key="frame" x="6" y="6" width="39" height="15"/>
                                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="imF-dG-EJc">
-                                                        <font key="font" metaFont="system" size="12"/>
+                                                        <font key="font" metaFont="cellTitle"/>
                                                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -172,9 +172,9 @@
                                 </constraints>
                             </customView>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="G5c-Rs-bm9">
-                                <rect key="frame" x="-2" y="67" width="283" height="15"/>
+                                <rect key="frame" x="-2" y="65" width="283" height="15"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="J6k-lX-XBH">
-                                    <font key="font" metaFont="system" size="12"/>
+                                    <font key="font" metaFont="cellTitle"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
@@ -183,7 +183,7 @@
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="Jyk-HC-L8i" secondAttribute="trailing" id="1fr-Nw-0Np"/>
                             <constraint firstItem="0ZO-1i-5x9" firstAttribute="leading" secondItem="Eh5-bs-cIE" secondAttribute="leading" id="3qa-6Z-kj0"/>
-                            <constraint firstItem="G5c-Rs-bm9" firstAttribute="top" secondItem="0ZO-1i-5x9" secondAttribute="bottom" id="6Fy-5e-YkO"/>
+                            <constraint firstItem="G5c-Rs-bm9" firstAttribute="top" secondItem="0ZO-1i-5x9" secondAttribute="bottom" constant="2" id="6Fy-5e-YkO"/>
                             <constraint firstAttribute="trailing" secondItem="GKZ-Rg-mDm" secondAttribute="trailing" id="FHK-fJ-oyA"/>
                             <constraint firstItem="Jyk-HC-L8i" firstAttribute="leading" secondItem="Eh5-bs-cIE" secondAttribute="leading" id="Hef-Dw-hdR"/>
                             <constraint firstItem="G5c-Rs-bm9" firstAttribute="leading" secondItem="Eh5-bs-cIE" secondAttribute="leading" id="L3k-Xn-6SZ"/>

+ 4 - 1
PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.swift

@@ -59,6 +59,9 @@ class KMForgotPasswordView: KMBaseXibView {
     private func initializeUI() -> Void {
         emailTextField.delegate = self
 
+        emailBox.fillColor = NSColor(named: "texefiedfillcolor") ?? NSColor.white
+        emailBox.borderColor = NSColor(named: "DADBDE") ?? NSColor.gray
+
         resetPasswordsLabel.textColor = NSColor(named: "000000")
         resetPasswordsLabel.font = NSFont.SFMediumFontWithSize(20)
         emailTextField.stringValue = viewModel.email
@@ -66,7 +69,7 @@ class KMForgotPasswordView: KMBaseXibView {
         emailErrorLabel.textColor = NSColor(named: "FA1E5D")
         emailErrorLabel.font = NSFont.SFProTextRegularFont(9)
         nextBox.fillColor = NSColor(named: "273C62") ?? NSColor.blue
-        nextButton.setTitleColor(color: NSColor(named: "FFFFFF") ?? NSColor.white, font: NSFont.SFProTextRegularFont(16))
+        nextButton.setTitleColor(color: NSColor(named: "FFFFFF") ?? NSColor.white, font: NSFont.SFProTextRegularFont(13))
         backButton.setTitleColor(color: NSColor(named: "4982E6") ?? NSColor.blue, font: NSFont.SFProTextRegularFont(12))
     }
     

+ 1 - 1
PDF Office/PDF Master/MemberCenter/View/KMForgotPasswordView.xib

@@ -56,7 +56,7 @@
                                         <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LZp-o9-Dhb">
                                             <rect key="frame" x="6" y="6" width="265" height="14"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="11111" id="GEZ-nT-23M">
-                                                <font key="font" metaFont="system" size="11"/>
+                                                <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>

+ 5 - 3
PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift

@@ -90,6 +90,9 @@ class KMSignUpView: KMBaseXibView {
     }
     
     private func initializeUI() -> Void {
+        emailBox.fillColor = NSColor(named: "texefiedfillcolor") ?? NSColor.white
+        passwordBox.fillColor = NSColor(named: "texefiedfillcolor") ?? NSColor.white
+
         emailTextField.delegate = self
         verifficationTextField.delegate = self
         passwordTextField.delegate = self
@@ -112,7 +115,7 @@ class KMSignUpView: KMBaseXibView {
         }
         sendBox.borderColor = NSColor(named: "273C62") ?? NSColor.blue
         sendLabel.textColor = NSColor(named: "FFFFFF") ?? NSColor.white
-        sendLabel.font = NSFont.SFProTextRegularFont(16)
+        sendLabel.font = NSFont.SFProTextRegularFont(13)
         passwordErrorLabel.textColor = NSColor(named: "FA1E5D")
         passwordErrorLabel.font = NSFont.SFProTextRegularFont(9)
         stayCheckButton.image = NSImage(named: "CheckBoxNor")
@@ -166,7 +169,6 @@ class KMSignUpView: KMBaseXibView {
             if !self.viewModel.isValidEmail() { return }
             if mouseEntered {
                 self.sendBox.fillColor = NSColor(named: "000000_0.1") ?? NSColor.blue
-                self.sendBox.borderWidth = 1
             } else {
                 self.sendBox.fillColor = NSColor(named: "273C62") ?? NSColor.blue
             }
@@ -186,7 +188,7 @@ class KMSignUpView: KMBaseXibView {
         if viewModel.signUpState == .verificationCode {
             selectBox1.isHidden = false
             selectBox2.isHidden = true
-            verificationCodeButton.setTitleColor(color: NSColor(named: "4982E6") ?? NSColor.black, font: NSFont.SFProTextRegularFont(14))
+            verificationCodeButton.setTitleColor(color: NSColor(named: "4982E6") ?? NSColor.systemBlue, font: NSFont.SFProTextRegularFont(14))
             passwordButton.setTitleColor(color: NSColor(named: "42464D") ?? NSColor.black, font: NSFont.SFProTextRegularFont(14))
             verifficationView.isHidden = false
             passwordView.isHidden = true

+ 17 - 17
PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib

@@ -77,7 +77,7 @@
                                         <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lob-YZ-RnN">
                                             <rect key="frame" x="6" y="6" width="265" height="14"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="11111" id="pGk-LP-wDS">
-                                                <font key="font" metaFont="system" size="11"/>
+                                                <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
@@ -94,7 +94,7 @@
                                 </constraints>
                             </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="yZS-Ga-pGH">
-                                <rect key="frame" x="0.0" y="146" width="279" height="24"/>
+                                <rect key="frame" x="0.0" y="138" width="279" height="24"/>
                                 <subviews>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="vOR-7V-O8S">
                                         <rect key="frame" x="0.0" y="5" width="14" height="14"/>
@@ -140,7 +140,7 @@
                                 </constraints>
                             </customView>
                             <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Zvy-4N-s24">
-                                <rect key="frame" x="0.0" y="94" width="279" height="32"/>
+                                <rect key="frame" x="0.0" y="86" width="279" height="32"/>
                                 <view key="contentView" id="m27-RS-jQR">
                                     <rect key="frame" x="0.0" y="0.0" width="279" height="32"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -168,10 +168,10 @@
                                 </constraints>
                             </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Uda-x2-PoM">
-                                <rect key="frame" x="0.0" y="0.0" width="279" height="74"/>
+                                <rect key="frame" x="0.0" y="0.0" width="279" height="66"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nTy-dc-ic8">
-                                        <rect key="frame" x="16" y="58" width="265" height="16"/>
+                                        <rect key="frame" x="16" y="50" width="265" height="16"/>
                                         <textFieldCell key="cell" title="Label" id="eQy-xd-X9I">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -179,7 +179,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="ykU-at-pNt">
-                                        <rect key="frame" x="0.0" y="60" width="14" height="14"/>
+                                        <rect key="frame" x="0.0" y="52" width="14" height="14"/>
                                         <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="CheckBoxNor" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Fbb-PS-RV9">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
@@ -276,7 +276,7 @@
                                 </constraints>
                             </box>
                             <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Jdf-So-7eK">
-                                <rect key="frame" x="0.0" y="186" width="279" height="28"/>
+                                <rect key="frame" x="0.0" y="182" width="279" height="28"/>
                                 <view key="contentView" id="hWz-GX-iSg">
                                     <rect key="frame" x="1" y="1" width="277" height="26"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -293,7 +293,7 @@
                                                             <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q4E-Ah-Yxy">
                                                                 <rect key="frame" x="6" y="5" width="212" height="14"/>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="7p1-b6-AOB">
-                                                                    <font key="font" metaFont="system" size="11"/>
+                                                                    <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
@@ -317,7 +317,7 @@
                                                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9CR-yj-hV6">
                                                                 <rect key="frame" x="6" y="6" width="39" height="15"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="fPD-Vb-cyJ">
-                                                                    <font key="font" metaFont="system" size="12"/>
+                                                                    <font key="font" metaFont="cellTitle"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                 </textFieldCell>
@@ -349,7 +349,7 @@
                                                 <secureTextField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AGE-IA-Gl4">
                                                     <rect key="frame" x="6" y="6" width="247" height="14"/>
                                                     <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="QCj-QO-AzJ">
-                                                        <font key="font" metaFont="system" size="11"/>
+                                                        <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         <allowedInputSourceLocales>
@@ -360,7 +360,7 @@
                                                 <textField hidden="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GgF-lg-2Qh">
                                                     <rect key="frame" x="6" y="6" width="247" height="14"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="GAi-ha-pFG">
-                                                        <font key="font" metaFont="system" size="11"/>
+                                                        <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
@@ -408,7 +408,7 @@
                                 </constraints>
                             </box>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fa7-or-CZ6">
-                                <rect key="frame" x="-2" y="214" width="283" height="16"/>
+                                <rect key="frame" x="-2" y="212" width="283" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="AU7-am-n4v">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -416,7 +416,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WaO-uv-Tcx">
-                                <rect key="frame" x="-2" y="170" width="283" height="16"/>
+                                <rect key="frame" x="-2" y="164" width="283" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="tnz-ZO-Lot">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -430,14 +430,14 @@
                             <constraint firstItem="fa7-or-CZ6" firstAttribute="leading" secondItem="WvZ-Os-Yih" secondAttribute="leading" id="4qf-cN-7Wz"/>
                             <constraint firstItem="XV5-2b-Qw8" firstAttribute="top" secondItem="Z9i-R9-yxT" secondAttribute="bottom" constant="20" id="7Ee-6d-uup"/>
                             <constraint firstItem="Uda-x2-PoM" firstAttribute="leading" secondItem="WvZ-Os-Yih" secondAttribute="leading" id="7eK-AX-Lp4"/>
-                            <constraint firstItem="fa7-or-CZ6" firstAttribute="top" secondItem="44b-nP-faG" secondAttribute="bottom" id="Gcv-el-LnT"/>
+                            <constraint firstItem="fa7-or-CZ6" firstAttribute="top" secondItem="44b-nP-faG" secondAttribute="bottom" constant="2" id="Gcv-el-LnT"/>
                             <constraint firstAttribute="trailing" secondItem="44b-nP-faG" secondAttribute="trailing" id="JaX-E0-TgB"/>
-                            <constraint firstItem="WaO-uv-Tcx" firstAttribute="top" secondItem="Jdf-So-7eK" secondAttribute="bottom" id="SyI-et-twW"/>
+                            <constraint firstItem="WaO-uv-Tcx" firstAttribute="top" secondItem="Jdf-So-7eK" secondAttribute="bottom" constant="2" id="SyI-et-twW"/>
                             <constraint firstItem="XV5-2b-Qw8" firstAttribute="leading" secondItem="WvZ-Os-Yih" secondAttribute="leading" id="VlQ-jA-mbV"/>
                             <constraint firstAttribute="trailing" secondItem="Zvy-4N-s24" secondAttribute="trailing" id="WUR-zP-PxW"/>
                             <constraint firstAttribute="trailing" secondItem="XV5-2b-Qw8" secondAttribute="trailing" id="YJK-ZK-9kL"/>
-                            <constraint firstItem="yZS-Ga-pGH" firstAttribute="top" secondItem="Jdf-So-7eK" secondAttribute="bottom" constant="16" id="a9V-RH-pd3"/>
-                            <constraint firstItem="Jdf-So-7eK" firstAttribute="top" secondItem="44b-nP-faG" secondAttribute="bottom" constant="16" id="c5g-7n-wKS"/>
+                            <constraint firstItem="yZS-Ga-pGH" firstAttribute="top" secondItem="Jdf-So-7eK" secondAttribute="bottom" constant="20" id="a9V-RH-pd3"/>
+                            <constraint firstItem="Jdf-So-7eK" firstAttribute="top" secondItem="44b-nP-faG" secondAttribute="bottom" constant="20" id="c5g-7n-wKS"/>
                             <constraint firstAttribute="trailing" secondItem="WaO-uv-Tcx" secondAttribute="trailing" id="cgH-gj-VtL"/>
                             <constraint firstAttribute="trailing" secondItem="yZS-Ga-pGH" secondAttribute="trailing" id="clt-hv-xYh"/>
                             <constraint firstItem="Uda-x2-PoM" firstAttribute="top" secondItem="Zvy-4N-s24" secondAttribute="bottom" constant="20" id="eiD-5U-xAN"/>

+ 14 - 13
PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -128,19 +128,19 @@ class KMUserInfoViewController: NSViewController {
         }
         number5Label.stringValue = NSLocalizedString("Devices Access", tableName: "MemberCenterLocalizable", comment: "")
         if KMMemberInfo.shared.userScenarioType == .lite_type1 || KMMemberInfo.shared.userScenarioType == .lite_type9 {
-            buyNow1Label.stringValue = NSLocalizedString("开通会员", tableName: "MemberCenterLocalizable", comment: "")
-            buyNow2Label.stringValue = NSLocalizedString("立即试用", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow1Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow2Label.stringValue = NSLocalizedString("7-Day Free Trial", tableName: "MemberCenterLocalizable", comment: "")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type3 || KMMemberInfo.shared.userScenarioType == .lite_type11 {
-            buyNow3Label.stringValue = NSLocalizedString("开通会员", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow3Label.stringValue = NSLocalizedString("Buy Now", tableName: "MemberCenterLocalizable", comment: "")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type5 ||
                     KMMemberInfo.shared.userScenarioType == .pro_type1 ||
                     KMMemberInfo.shared.userScenarioType == .pro_type2 ||
                     KMMemberInfo.shared.userScenarioType == .pro_type3 {
-            buyNow3Label.stringValue = NSLocalizedString("Upgrade", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow3Label.stringValue = NSLocalizedString("Upgrade Now", tableName: "MemberCenterLocalizable", comment: "")
         } else if KMMemberInfo.shared.userScenarioType == .lite_type7 ||
                     KMMemberInfo.shared.userScenarioType == .lite_type8 ||
                     KMMemberInfo.shared.userScenarioType == .lite_type13 {
-            buyNow3Label.stringValue = NSLocalizedString("续费", tableName: "MemberCenterLocalizable", comment: "")
+            buyNow3Label.stringValue = NSLocalizedString("Renew now", tableName: "MemberCenterLocalizable", comment: "")
         }
     }
     
@@ -148,23 +148,24 @@ class KMUserInfoViewController: NSViewController {
         userImageView.image = NSImage(named: "UserProfilePicture_Size")
         emailLabel.textColor = NSColor(named: "0E1114")
         emailLabel.font = NSFont.SFMediumFontWithSize(14)
-        productLabel.textColor = NSColor(named: "42464D")
+        productLabel.textColor = NSColor(named: "42464D_1")
         productLabel.font = NSFont.SFProTextRegularFont(12)
-        membershipLabel.textColor = NSColor(named: "0E1114")
+        membershipLabel.textColor = NSColor(hex: "0E1114")
         membershipLabel.font = NSFont.SFMediumFontWithSize(16)
         lockedBackgroud.image = NSImage(named: "ButtonBackgroundImage1")
-        lockedLabel.textColor = NSColor(named: "42464D")
+        lockedLabel.textColor = NSColor(hex: "42464D")
         lockedLabel.font = NSFont.SFMediumFontWithSize(12)
         rightsBox.contentView = rightsView
-        number1Label.textColor = NSColor(named: "0E1114")
+        number1Label.textColor = NSColor(hex: "0E1114")
         number1Label.font = NSFont.SFMediumFontWithSize(24)
         number1ImageView.image = NSImage(named: "UpgradeImage")
-        number2Label.textColor = NSColor(named: "42464D")
+        number2Label.textColor = NSColor(hex:"42464D")
         number2Label.font = NSFont.SFProTextRegularFont(12)
-        number3Label.textColor = NSColor(named: "42464D")
+        number3Label.textColor =  NSColor(hex:"42464D")
         number3Label.font = NSFont.SFProTextRegularFont(12)
-        number5Label.textColor = NSColor(named: "42464D")
+        number5Label.textColor = NSColor(hex: "42464D")
         number5Label.font = NSFont.SFProTextRegularFont(12)
+        number4Label.textColor = NSColor(hex: "42464D")
         buyNow1ImageView.image = NSImage(named: "ButtonBackgroundImage2")
         buyNow2ImageView.image = NSImage(named: "ButtonBackgroundImage2")
         buyNow3ImageView.image = NSImage(named: "ButtonBackgroundImage2")
@@ -349,7 +350,7 @@ class KMUserInfoViewController: NSViewController {
         accountCenterBox.moveCallback =  { [weak self](mouseEntered: Bool, mouseBox: KMBox) -> Void in
             guard let self = self else { return }
             if mouseEntered {
-                self.accountCenterBox.fillColor = NSColor(named: "F5FAFF") ?? NSColor.gray
+                self.accountCenterBox.fillColor = .clear
                 self.accountLabel.textColor = NSColor(named: "3091FF")
                 self.accountImageView.image = NSImage(named: "AccountCenterImage_Hov")
             } else {

+ 2 - 2
PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 4 - 4
PDF Office/PDF Master/MemberCenter/ViewModel/KMUserInfoVCModel.swift

@@ -100,8 +100,8 @@ class KMUserInfoVCModel: ObservableObject {
      */
     func signOutAction() -> Void {
         NotificationCenter.default.post(name: NSNotification.Name("CloseMenuNotification"), object: nil)
-        KMMemberPromptWC.shared.tipType = .logout
         KMMemberPromptWC.shared.showWindow(nil)
+        KMMemberPromptWC.shared.tipType = .logout
     }
     
     /**
@@ -116,8 +116,8 @@ class KMUserInfoVCModel: ObservableObject {
                 let msg = resultDict.msg
                 if success {
                     self.refreshUserInfo { success, msg in
-                        KMMemberPromptWC.shared.tipType = .cancelSignout
                         KMMemberPromptWC.shared.showWindow(nil)
+                        KMMemberPromptWC.shared.tipType = .cancelSignout
                     }
                 } else {
                     print(msg as Any)
@@ -127,13 +127,13 @@ class KMUserInfoVCModel: ObservableObject {
             if KMMemberInfo.shared.vip_status == 1 {
                 // 订阅用户提示退订
                 NotificationCenter.default.post(name: NSNotification.Name("CloseMenuNotification"), object: nil)
-                KMMemberPromptWC.shared.tipType = .unsubscribe
                 KMMemberPromptWC.shared.showWindow(nil)
+                KMMemberPromptWC.shared.tipType = .unsubscribe
             } else {
                 // 手动注销
                 NotificationCenter.default.post(name: NSNotification.Name("CloseMenuNotification"), object: nil)
-                KMMemberPromptWC.shared.tipType = .signout
                 KMMemberPromptWC.shared.showWindow(nil)
+                KMMemberPromptWC.shared.tipType = .signout
             }
         }
     }

+ 12 - 1
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.swift

@@ -52,13 +52,24 @@ class KMCloseAccountWC: NSWindowController {
     }
     
     private func initializeUI() -> Void {
+        self.window?.contentView?.wantsLayer = true
+        self.window?.contentView?.layer?.backgroundColor = (NSColor(named: "membercentercolor") ?? NSColor.white).cgColor
+
         titleLabel.textColor = NSColor(named: "000000_0.85")
         titleLabel.font = NSFont.SFProTextSemiboldFont(13)
         subTitleLabel.textColor = NSColor(named: "000000_0.85")
         subTitleLabel.font = NSFont.SFProTextRegularFont(12)
         productBox.borderColor = NSColor(named: "DADBDE") ?? .gray
-        productBox.fillColor = .gray
         productLabel.textColor = NSColor(named: "42464D")
+        productView.wantsLayer = true
+        productView.layer?.backgroundColor = NSColor(named: "000000_0.05")?.cgColor
+        
+        proView.wantsLayer = true
+        proView.layer?.backgroundColor = NSColor(named: "000000_0.76")?.cgColor
+
+        aiView.wantsLayer = true
+        aiView.layer?.backgroundColor = NSColor(named: "000000_0.76")?.cgColor
+
         productLabel.font = NSFont.SFProTextRegularFont(13)
         if KMMemberInfo.shared.ai_productName == "" {
             aiView.isHidden = true

+ 4 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseAccountWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -24,10 +24,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="480" height="270"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="358" height="274"/>
                 <autoresizingMask key="autoresizingMask"/>

+ 3 - 0
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.swift

@@ -43,6 +43,9 @@ class KMCloseApplyWC: NSWindowController {
     }
     
     private func initializeUI() -> Void {
+        self.window?.contentView?.wantsLayer = true
+        self.window?.contentView?.layer?.backgroundColor = (NSColor(named: "membercentercolor") ?? NSColor.white).cgColor
+
         titleLabel.textColor = NSColor(named: "000000_0.85")
         titleLabel.font = NSFont.SFProTextSemiboldFont(13)
         subTitleLabel.textColor = NSColor(named: "000000_0.85")

+ 4 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseApplyWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,10 +16,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="358" height="312"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="358" height="312"/>
             <value key="maxSize" type="size" width="358" height="312"/>
             <view key="contentView" id="se5-gp-TjO">

+ 7 - 2
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.swift

@@ -48,7 +48,7 @@ class KMCloseVerificationWC: NSWindowController {
     
     private func languageLocalized() -> Void {
         titleLabel.stringValue = NSLocalizedString("Verify your identity", tableName: "MemberCenterLocalizable", comment: "")
-        subTitleLabel1.stringValue = NSLocalizedString("We have sent you a code via email to", comment: "")
+        subTitleLabel1.stringValue = NSLocalizedString("We have sent you a code via email to", tableName: "MemberCenterLocalizable", comment: "")
         subTitleLabel2.stringValue = KMMemberInfo.shared.userEmail
         nextButton.title = NSLocalizedString("Next", tableName: "MemberCenterLocalizable", comment: "")
         verifficationErrorLabel.stringValue = String(format: "%@", NSLocalizedString("Verification code error.", tableName: "MemberCenterLocalizable", comment: ""))
@@ -56,6 +56,11 @@ class KMCloseVerificationWC: NSWindowController {
     }
     
     private func initializeUI() -> Void {
+        self.window?.contentView?.wantsLayer = true
+        self.window?.contentView?.layer?.backgroundColor = (NSColor(named: "membercentercolor") ?? NSColor.white).cgColor
+
+        verifficationBox.fillColor = NSColor(named: "texefiedfillcolor") ?? NSColor.white
+
         verifficationErrorLabel.isHidden = !signUpModel.passwordError()
 
         titleLabel.textColor = NSColor(named: "000000_0.85")
@@ -71,7 +76,7 @@ class KMCloseVerificationWC: NSWindowController {
         sendBox.fillColor = NSColor(named: "273C62") ?? NSColor.blue
         sendBox.borderColor = NSColor(named: "273C62") ?? NSColor.blue
         sendLabel.textColor = NSColor(named: "FFFFFF") ?? NSColor.white
-        sendLabel.font = NSFont.SFProTextRegularFont(16)
+        sendLabel.font = NSFont.SFProTextRegularFont(13)
         verifficationErrorLabel.textColor = NSColor(named: "FA1E5D")
         verifficationErrorLabel.font = NSFont.SFProTextRegularFont(9)
         

+ 4 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMCloseVerificationWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,10 +23,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="358" height="312"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="358" height="312"/>
             <value key="maxSize" type="size" width="358" height="312"/>
             <view key="contentView" id="se5-gp-TjO">

+ 1 - 0
PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.swift

@@ -51,6 +51,7 @@ class KMLoginWindowsController: NSWindowController {
             let signUpView = KMSignUpView()
             signUpView.frame = rightBox.frame
             rightBox.contentView = signUpView
+            rightBox.fillColor = NSColor(named: "membercentercolor") ?? NSColor.white
         }
     }
     

+ 2 - 2
PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.xib

@@ -16,8 +16,8 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
-            <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="196" y="240" width="661" height="443"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="661" height="443"/>

+ 8 - 1
PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.swift

@@ -25,7 +25,11 @@ class KMMemberPromptWC: NSWindowController {
 
     private var viewModel = KMUserInfoVCModel()
     
-    var tipType: KMMemberTipType = .logout
+    var tipType: KMMemberTipType = .logout {
+        didSet {
+            languageLocalized()
+        }
+    }
     
     static let shared: KMMemberPromptWC = {
         let windowC = KMMemberPromptWC(windowNibName: "KMMemberPromptWC")
@@ -75,6 +79,9 @@ class KMMemberPromptWC: NSWindowController {
     }
     
     private func initializeUI() -> Void {
+        self.window?.contentView?.wantsLayer = true
+        self.window?.contentView?.layer?.backgroundColor = (NSColor(named: "membercentercolor") ?? NSColor.white).cgColor
+
         if tipType == .logout {
             titleLabel.textColor = NSColor(named: "000000_0.85")
             titleLabel.font = NSFont.SFProTextSemiboldFont(13)

+ 4 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberPromptWC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,10 +17,10 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="332" height="153"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="332" height="153"/>
             <value key="maxSize" type="size" width="332" height="153"/>
             <view key="contentView" id="se5-gp-TjO">