525bc7c · dashared/GDproject

git.iko.soy/dashared/GDproject

fixed a few bugs

commit525bc7c1c52b7b2baa590c1485e8a3da72d543c8 authorDarya Rednikina <rednikina.com@yandex.ru> dateSat 11 May 2019, 22:50 (7 years ago) parenta733f64

3 files changed+91−3

compare with master

unifiedsplit

GDproject/Controller/Log In/FacultyTableViewController.swift+1 GDproject/Controller/Log In/LogInViewController.swift+2 GDproject/Simple model/Model.swift+88−3

GDproject/Controller/Log In/FacultyTableViewController.swift+1

@@ -81,6 +81,7 @@ class FacultyTableViewController: UITableViewController {

8181

8282 override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

8383 delegate?.onChooseFaculty(faculty: currentFaculties[indexPath.row])

84+ searchController.dismiss(animated: true, completion: nil)

8485 self.navigationController?.popViewController(animated: true)

8586 }

8687

GDproject/Controller/Log In/LogInViewController.swift+2

@@ -47,6 +47,8 @@ class LogInViewController: UIViewController {

4747 textField.placeholder = "Mail"

4848 textField.borderStyle = .roundedRect

4949 textField.textColor = .black

50+ textField.autocorrectionType = UITextAutocorrectionType.no

51+ textField.autocapitalizationType = UITextAutocapitalizationType.none

5052 textField.clearButtonMode = .always

5153 return textField

5254 }()

GDproject/Simple model/Model.swift+88−3

@@ -17,12 +17,14 @@ class Model{

1717 static var hashTagTree: CompletionTree?

1818

1919 private static var isValidTocken: ((Int)->())? = { responce in

20− print(responce)

20+

2121 if responce == invalidTocken {

22+

23+ DataStorage.standard.setIsLoggedIn(value: false, with: 0)

24+ (UIApplication.shared.delegate as! AppDelegate).relaunch()

25+

2226 Model.logout {

2327 print("Logout Is Successful")

24− DataStorage.standard.setIsLoggedIn(value: false, with: 0)

25− (UIApplication.shared.delegate as! AppDelegate).relaunch()

2628 }

2729 }

2830 }

@@ -208,6 +210,10 @@ class Model{

208210 AF.request(request).response { (responce) in

209211 isValidTocken?(responce.response?.statusCode ?? 498)

210212

213+ if let code = responce.response?.statusCode, code == 498 {

214+ return

215+ }

216+

211217 completion()

212218 }

213219 }

@@ -240,6 +246,10 @@ class Model{

240246 guard let code = responce.response?.statusCode else { return }

241247 isValidTocken?(code)

242248

249+ if let code = responce.response?.statusCode, code == 498 {

250+ return

251+ }

252+

243253 if code == 204 {

244254 let fields = responce.response?.allHeaderFields as? [String :String]

245255

@@ -249,6 +259,7 @@ class Model{

249259

250260 completion()

251261 }

262+

252263 }

253264 }

254265

@@ -264,6 +275,10 @@ class Model{

264275 guard let statusCode = responce.response?.statusCode else { completion(false); return }

265276 isValidTocken?(statusCode)

266277

278+ if let code = responce.response?.statusCode, code == 498 {

279+ return

280+ }

281+

267282 if statusCode == 204 {

268283 // at this point cookies are set

269284 completion(true)

@@ -283,6 +298,10 @@ class Model{

283298 guard let statusCode = responce.response?.statusCode else { completion(false); return }

284299 isValidTocken?(statusCode)

285300

301+ if let code = responce.response?.statusCode, code == 498 {

302+ return

303+ }

304+

286305 guard let json = responce.data else { return }

287306 guard let personId = Int(String(data: json, encoding: String.Encoding.utf8)!) else {

288307 completion(false)

@@ -377,6 +396,10 @@ class Model{

377396

378397 isValidTocken?(response.response?.statusCode ?? 498)

379398

399+ if let code = response.response?.statusCode, code == 498 {

400+ return

401+ }

402+

380403 guard let json = response.data else { return }

381404

382405 guard let newQueery = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { print("no")

@@ -402,6 +425,10 @@ class Model{

402425 (response) in

403426

404427 isValidTocken?(response.response?.statusCode ?? 498)

428+

429+ if let code = response.response?.statusCode, code == 498 {

430+ return

431+ }

405432 }

406433 }

407434

@@ -427,6 +454,10 @@ class Model{

427454

428455 isValidTocken?(response.response?.statusCode ?? 498)

429456

457+ if let code = response.response?.statusCode, code == 498 {

458+ return

459+ }

460+

430461 guard let json = response.data else { return }

431462

432463 guard let newPost = try? decoder.decode(QueryPosts<Posts>.self, from: json) else { return }

@@ -453,6 +484,10 @@ class Model{

453484

454485 isValidTocken?(response.response?.statusCode ?? 498)

455486

487+ if let code = response.response?.statusCode, code == 498 {

488+ return

489+ }

490+

456491 guard let json = response.data else { return }

457492

458493 guard let users = try? decoder.decode([Users].self, from: json) else { return }

@@ -485,6 +520,9 @@ class Model{

485520

486521 isValidTocken?(response.response?.statusCode ?? 498)

487522

523+ if let code = response.response?.statusCode, code == 498 {

524+ return

525+ }

488526

489527 guard let json = response.data else { return }

490528

@@ -507,6 +545,9 @@ class Model{

507545 (response) in

508546

509547 isValidTocken?(response.response?.statusCode ?? 498)

548+ if let code = response.response?.statusCode, code == 498 {

549+ return

550+ }

510551 }

511552

512553 }

@@ -519,6 +560,9 @@ class Model{

519560 AF.request(request).responseJSON { (response) in

520561

521562 isValidTocken?(response.response?.statusCode ?? 498)

563+ if let code = response.response?.statusCode, code == 498 {

564+ return

565+ }

522566

523567 guard let json = response.data else { return }

524568

@@ -537,6 +581,9 @@ class Model{

537581

538582 AF.request(request).response { (response) in

539583 isValidTocken?(response.response?.statusCode ?? 498)

584+ if let code = response.response?.statusCode, code == 498 {

585+ return

586+ }

540587 }

541588 completion()

542589 }

@@ -552,6 +599,9 @@ class Model{

552599 (response) in

553600

554601 isValidTocken?(response.response?.statusCode ?? 498)

602+ if let code = response.response?.statusCode, code == 498 {

603+ return

604+ }

555605 }

556606 }

557607

@@ -574,6 +624,9 @@ class Model{

574624 }

575625

576626 isValidTocken?(response.response?.statusCode ?? 498)

627+ if let code = response.response?.statusCode, code == 498 {

628+ return

629+ }

577630 }

578631 }

579632

@@ -649,6 +702,9 @@ class Model{

649702 (response) in

650703

651704 isValidTocken?(response.response?.statusCode ?? 498)

705+ if let code = response.response?.statusCode, code == 498 {

706+ return

707+ }

652708

653709 guard let json = response.data else { return }

654710

@@ -664,6 +720,9 @@ class Model{

664720 AF.request(URLRequest(url: hashTagTreeURL)).responseJSON {

665721 (response) in

666722 isValidTocken?(response.response?.statusCode ?? 498)

723+ if let code = response.response?.statusCode, code == 498 {

724+ return

725+ }

667726 guard let json = response.data else { return }

668727 guard let tree = try? decoder.decode(CompletionTree.self, from: json) else { return }

669728 completion(tree)

@@ -681,6 +740,10 @@ class Model{

681740 AF.request(request).responseJSON { response in

682741 isValidTocken?(response.response?.statusCode ?? 498)

683742

743+ if let code = response.response?.statusCode, code == 498 {

744+ return

745+ }

746+

684747 guard let json = response.data else { return }

685748 let dialogs = try! decoder.decode(QueryPosts<Dialog>.self, from: json)

686749

@@ -852,6 +915,9 @@ class Model{

852915 AF.request(request).response { (response) in

853916

854917 isValidTocken?(response.response?.statusCode ?? 498)

918+ if let code = response.response?.statusCode, code == 498 {

919+ return

920+ }

855921

856922 guard let json = response.data else { return }

857923 let stringInt = String.init(data: json, encoding: String.Encoding.utf8)

@@ -880,6 +946,9 @@ class Model{

880946 AF.request(request!).response { (response) in

881947

882948 isValidTocken?(response.response?.statusCode ?? 498)

949+ if let code = response.response?.statusCode, code == 498 {

950+ return

951+ }

883952

884953 guard let json = response.data else { return }

885954 guard let messages = try? decoder.decode([LastMessage].self, from: json) else { return }

@@ -897,6 +966,10 @@ class Model{

897966

898967 AF.request(request).response { (response) in

899968 isValidTocken?(response.response?.statusCode ?? 498)

969+

970+ if let code = response.response?.statusCode, code == 498 {

971+ return

972+ }

900973 }

901974

902975 completion()

@@ -911,6 +984,10 @@ class Model{

911984

912985 AF.request(request).response { (response) in

913986 isValidTocken?(response.response?.statusCode ?? 498)

987+

988+ if let code = response.response?.statusCode, code == 498 {

989+ return

990+ }

914991 }

915992

916993 // completion()

@@ -963,6 +1040,10 @@ class Model{

9631040 AF.request(request).response { (response) in

9641041 isValidTocken?(response.response?.statusCode ?? 498)

9651042

1043+ if let code = response.response?.statusCode, code == 498 {

1044+ return

1045+ }

1046+

9661047 completion()

9671048 }

9681049 }

@@ -990,6 +1071,10 @@ class Model{

9901071 AF.request(request).response { (response) in

9911072 isValidTocken?(response.response?.statusCode ?? 498)

9921073

1074+ if let code = response.response?.statusCode, code == 498 {

1075+ return

1076+ }

1077+

9931078 guard let json = response.data else { return }

9941079 guard let faculties = try? decoder.decode([Faculty].self, from: json) else { return }

9951080