导航以及页面修改

iOSFirst/SwiftUIToast.swift

@@ -63,7 +63,7 @@ public class SUIToastController : ObservableObject {
     
     func startTimer() {
         updateTimer = .scheduledTimer(
-            timeInterval: 0.1,
+            timeInterval: 0.05,
             target: self,
             selector: #selector(SUIToastController.onUpdate),
             userInfo: nil,

iOSFirst/TestView.swift

@@ -0,0 +1,34 @@
+//
+//  TestView.swift
+//  iOSFirst
+//
+//  Created by 孙宇峰 on 2023/2/23.
+//
+
+import SwiftUI
+
+struct TestView: View {
+    @Binding var settingPagePresented: Bool
+    
+    var body: some View {
+        NavigationView {
+            Text("hello world")
+            .navigationTitle("设置")
+            .navigationBarItems(leading: Button(action: {
+                settingPagePresented = false
+            }, label: {
+                Image(systemName: "globe")
+                    .imageScale(.large)
+                    .foregroundColor(.accentColor)
+            
+            }))
+            .navigationBarTitleDisplayMode(.inline)
+        }
+    }
+}
+
+struct TestView_Previews: PreviewProvider {
+    static var previews: some View {
+        TestView(settingPagePresented: .constant(true))
+    }
+}

iOSFirst/login/LoginView.swift

@@ -13,7 +13,9 @@ import RxRelay
 struct LoginView: View {
     private var viewModel = LoginViewModel()
     var bag = DisposeBag()
-    
+    @State private var inputAccountMessage:String = ""
+    @State private var isPresent:Bool = false
+    @State private var inputPasswordMessage:String = ""
     
     var body: some View {
         
@@ -47,8 +49,8 @@ struct LoginView: View {
                     .foregroundColor(.accentColor)
                     .frame(width: 240,height: 35)
             }.frame(height: 40)
-            .padding(.top,20)
-            .padding(.bottom,100)
+                .padding(.top,20)
+                .padding(.bottom,100)
             
             VStack(alignment: .leading, spacing: 400) {
                 HStack(alignment: .center, spacing: 15) {
@@ -56,8 +58,8 @@ struct LoginView: View {
                         .imageScale(.large)
                         .foregroundColor(.accentColor)
                     
-                    TextField("请输入手机号",text:.constant(""))
-                        .id("etPhoneNum")
+                    TextField("请输入手机号",text:$inputAccountMessage)
+                        .keyboardType(UIKeyboardType.namePhonePad)
                         .font(.system(size: 16))
                         .frame(maxWidth: .infinity,alignment: .center)
                     
@@ -73,8 +75,9 @@ struct LoginView: View {
                         .imageScale(.large)
                         .foregroundColor(.accentColor)
                     
-                    TextField("请输入密码",text:.constant(""))
-                        .id("etPassword")
+                    SecureField("请输入密码",text:$inputPasswordMessage)
+                        .textContentType(.oneTimeCode)
+                        .keyboardType(UIKeyboardType.namePhonePad)
                         .font(.system(size: 16))
                         .frame(maxWidth: .infinity,alignment: .center)
                     
@@ -88,15 +91,25 @@ struct LoginView: View {
             VStack(alignment: .trailing, spacing: 400) {
                 
                 VStack(alignment: .center, spacing: 15) {
+                    
                     Button(action: {
-//                        let msg="点击了登录按钮"
-//                        print(msg)
-                        viewModel.loginUser()
-//                        SUIToast.show(messageItem: .init(
-//                            message: msg,
-//                            bgColor: .gray,
-//                            messageColor: .white
-//                        ))
+                        if(inputAccountMessage.isEmpty){
+                            SUIToast.show(messageItem: .init(
+                                message: "账号不能为空",
+                                bgColor: .gray,
+                                messageColor: .white
+                            ))
+                        }else if(inputPasswordMessage.isEmpty){
+                            SUIToast.show(messageItem: .init(
+                                message: "密码不能为空",
+                                bgColor: .gray,
+                                messageColor: .white
+                            ))
+                        }else {
+                            viewModel.loginUser(username: inputAccountMessage, password: inputPasswordMessage)
+                            isPresent=true
+                        }
+                        
                     }) {
                         Text("登录")
                             .font(.system(size: 17))
@@ -106,6 +119,8 @@ struct LoginView: View {
                             .foregroundColor(.white)
                             .background(.blue)
                             .cornerRadius(30)
+                    }.fullScreenCover(isPresented: $isPresent) {
+                        TestView(settingPagePresented: $isPresent)
                     }
                     
                 }
@@ -141,7 +156,7 @@ struct LoginView: View {
         }.padding()
             .frame(width: .infinity,height: .infinity)
     }
-
+    
 }
 
 struct ContentView_Previews: PreviewProvider {

iOSFirst/login/LoginViewModel.swift

@@ -13,33 +13,33 @@ import RxRelay
 
 
 class LoginViewModel  {
-
+    
     private let service:MoyaProvider<AccountService>
-       private var bag = DisposeBag()
-       var userResponse = PublishSubject<LoginUserInfo>()
-       
+    private var bag = DisposeBag()
+    var userResponse = PublishSubject<LoginUserInfo>()
+    
     init(service:MoyaProvider<AccountService> = accountProvider) {
-           self.service = service
-          
-       }
-       
-     
-    func loginUser() {
-           service.rx.request(.login("90012", "123456",false)).subscribe { [weak self] event in
-               switch event {
-               case let .success(response):
-                   do {
-                       let response = try response.mapJSON()
-                       log.info( response )
-                       
-                   } catch let error {
-                       log.error(error.localizedDescription)
-                   }
-               case .failure(let error):
-                   log.error(error.localizedDescription)
-               }
-           }.disposed(by: bag)
-
-       }
-       
+        self.service = service
+        
+    }
+    
+    
+    func loginUser(username:String,password:String) {
+        service.rx.request(.login(username, password,false)).subscribe { [weak self] event in
+            switch event {
+            case let .success(response):
+                do {
+                    let response = try response.mapString()
+                    log.info( response )
+                    
+                } catch let error {
+                    log.error(error.localizedDescription)
+                }
+            case .failure(let error):
+                log.error(error.localizedDescription)
+            }
+        }.disposed(by: bag)
+        
+    }
+    
 }

iOSFirst/network/service/AccountService.swift

@@ -58,7 +58,6 @@ extension AccountService: TargetType {
             
             return [
                 "st":"false",
-
                 "Content-type":"application/json"]
         default:
             return nil