密码不可见

OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -46,8 +46,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "209"
+            startingLineNumber = "223"
-            endingLineNumber = "209"
+            endingLineNumber = "223"
             landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -62,8 +62,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "213"
+            startingLineNumber = "227"
-            endingLineNumber = "213"
+            endingLineNumber = "227"
             landmarkName = "textView(_:shouldInteractWith:in:interaction:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -78,8 +78,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "82"
+            startingLineNumber = "96"
-            endingLineNumber = "82"
+            endingLineNumber = "96"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -1002,8 +1002,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "167"
+            startingLineNumber = "181"
-            endingLineNumber = "167"
+            endingLineNumber = "181"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1205,8 +1205,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "171"
+            startingLineNumber = "185"
-            endingLineNumber = "171"
+            endingLineNumber = "185"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1221,8 +1221,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "175"
+            startingLineNumber = "189"
-            endingLineNumber = "175"
+            endingLineNumber = "189"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1237,8 +1237,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "178"
+            startingLineNumber = "192"
-            endingLineNumber = "178"
+            endingLineNumber = "192"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1253,8 +1253,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "191"
+            startingLineNumber = "205"
-            endingLineNumber = "191"
+            endingLineNumber = "205"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1269,8 +1269,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "179"
+            startingLineNumber = "193"
-            endingLineNumber = "179"
+            endingLineNumber = "193"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -1333,8 +1333,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "180"
+            startingLineNumber = "194"
-            endingLineNumber = "180"
+            endingLineNumber = "194"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -1949,8 +1949,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "84"
+            startingLineNumber = "98"
-            endingLineNumber = "84"
+            endingLineNumber = "98"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2029,8 +2029,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "83"
+            startingLineNumber = "97"
-            endingLineNumber = "83"
+            endingLineNumber = "97"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -2077,8 +2077,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "86"
+            startingLineNumber = "100"
-            endingLineNumber = "86"
+            endingLineNumber = "100"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2093,8 +2093,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "88"
+            startingLineNumber = "102"
-            endingLineNumber = "88"
+            endingLineNumber = "102"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -2828,8 +2828,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "111"
+            startingLineNumber = "125"
-            endingLineNumber = "111"
+            endingLineNumber = "125"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -4487,8 +4487,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "162"
+            startingLineNumber = "176"
-            endingLineNumber = "162"
+            endingLineNumber = "176"
             landmarkName = "addActions()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4503,8 +4503,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "163"
+            startingLineNumber = "177"
-            endingLineNumber = "163"
+            endingLineNumber = "177"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -4551,8 +4551,8 @@
             filePath = "OrderScheduling/Login/ViewController/LoginController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "164"
+            startingLineNumber = "178"
-            endingLineNumber = "164"
+            endingLineNumber = "178"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>

OrderScheduling/Assets.xcassets/Login/login_eye_close.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "eye_close@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "eye_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "eye_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Assets.xcassets/Login/login_eye_open.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "eye_open@1x.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "eye_open@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "eye_open@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

OrderScheduling/Login/ViewController/LoginController.swift

@@ -46,6 +46,10 @@ extension LoginController {
         loginView.phoneView.textfield.text = USER.phone
         loginView.codeView.titleLabel.text = "密码"
         loginView.codeView.textfield.attributedPlaceholder = NSAttributedString(string: "请输入密码",attributes: [.foregroundColor: UIColor.hex("203152").alpha(0.2),.font:UIFont.regularFont(auto(14))])
+        loginView.codeView.textfield.isSecureTextEntry = true
+        loginView.codeView.eyeButton.isHidden = false
+        loginView.codeView.eyeButton.setImage(UIImage(named: "login_eye_close"), for: .normal)
+        loginView.codeView.eyeButton.setImage(UIImage(named: "login_eye_open"), for: .selected)
         loginView.agreeButton.setBackgroundImage(UIImage(named: "login_agree_unselected"), for: .normal)
         loginView.agreeButton.setBackgroundImage(UIImage(named: "login_agree_selected"), for: .selected)
         let privacyText = NSAttributedString.init(string: "已阅读并同意",attributes: [.foregroundColor:UIColor.hex("203152"),.font:UIFont.regularFont(auto(14))]).dd_mutable()
@@ -67,6 +71,16 @@ extension LoginController {
 }
 extension LoginController {
     func addActions() {
+        loginView.codeView.eyeButton.rx.tap
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: {[weak self] in
+                if let isSelected = self?.loginView.codeView.eyeButton.isSelected {
+                    self?.loginView.codeView.eyeButton.isSelected = !isSelected
+                    self?.loginView.codeView.textfield.isSecureTextEntry = isSelected
+                }
+            })
+            .disposed(by: disposeBag)
+        
         loginView.agreeButton.rx.tap
             .asDriver()
             .drive(onNext: {[weak self] _ in
@@ -306,16 +320,20 @@ class LoginView : DDView {
 class LoginInputView : DDView {
     public let titleLabel : DDLabel
     public let textfield : DDTextField
+    public let eyeButton : DDButton
     public let line : DDView
     override init(frame: CGRect) {
         titleLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(15)), textColor: .hex("203152"))
         textfield = DDTextField.init()
+        eyeButton = DDButton.dd_initCustom()
         line = DDView.init()
         line.backgroundColor = .hex("F1F2F5")
         super.init(frame: frame)
         
         addSubview(titleLabel)
         addSubview(textfield)
+        eyeButton.isHidden = true
+        addSubview(eyeButton)
         addSubview(line)
         
         line.snp.makeConstraints { make in
@@ -334,9 +352,14 @@ class LoginInputView : DDView {
             make.left.equalTo(titleLabel)
             make.bottom.equalTo(line.snp.top).offset(-auto(5))
             make.left.equalTo(line)
-            make.right.equalToSuperview()
+            make.right.equalTo(eyeButton.snp.left).offset(-auto(5))
         }
 
+        eyeButton.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-auto(10))
+            make.centerY.equalTo(textfield)
+            make.width.equalTo(auto(48))
+        }
     }
     
     required public init?(coder: NSCoder) {

fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000339">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000169">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: gym" time="70.27658">
+      <testcase classname="fastlane.lanes" name="1: gym" time="78.257009">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="10.406596">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="22.209904">
         
       </testcase>