From d80eec0f51c1c0fd0884e90418a20bb9bb803ee3 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Tue, 24 Apr 2018 18:13:05 +0800
Subject: [PATCH] bug修复
---
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 378797 -> 0 bytes
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | 2 +-
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift | 11 ++++++++---
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift | 4 ++--
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift | 4 ++--
ParentAssistant/ParentAssistant/Classes/util/AccountManager.swift | 1 +
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 911e7a9..4b01b4c 100644
Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index c64041a..74754fe 100644
--- a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -20,7 +20,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ParentAssistant/Classes/util/NIM/YXMessageManager.swift"
- timestampString = "546255709.753268"
+ timestampString = "546257540.733687"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "124"
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
index f5c0fe8..6715fb5 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
@@ -119,8 +119,6 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
title = "未绑定"
}else{
title = array[0].studentName
- self.childDataModel = array[0]
-
}
}else{
title = "未登录"
@@ -215,12 +213,19 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
private func setChildViewContent(){
print("scrollView width === \(contentScrollView.bounds.size.width)")
+ if AccountManager.shared.isOnline() {
+ let array = AccountManager.shared.getChildClassInfo()
+ if !array.isEmpty{
+ let model = array[0]
+ childDataModel = model
+ }
+ }
//添加子控制器
for i in 0..<titleArr.count {
if i == 0 {
let vc = ProgramViewController()
self.addChildViewController(vc)
- vc.studentModel = self.childDataModel
+ vc.studentModel = childDataModel
contentScrollView.addSubview(vc.view)
}
if i == 1 {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
index 856c255..6202b2d 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
@@ -11,7 +11,6 @@ import UIKit
class ProgramCardViewController: UIViewController,UITextFieldDelegate {
var cardInputTextField = UITextField()
-
//孩子数据
var studentData = StudentClassInfoModel()
@@ -34,7 +33,8 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
@objc func applyAction(){
DebugLog( "补卡提交")
- let params = ["studentid":1,"onecard":"sss"] as [String : Any]
+ let studentID = self.studentData.studentId
+ let params = ["studentid":studentID,"onecard":self.cardInputTextField.text!] as [String : AnyObject]
HTTPServer.shared.postStudentMendCard(parameters: params as [String : AnyObject]) { (backData, error) in
print(backData!)
if error == nil && JSON.fromString(backData)!["status"].intValue == 1 {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift
index 33c753c..2e034a2 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramViewController.swift
@@ -122,12 +122,12 @@ class ProgramViewController: UIViewController,UITableViewDelegate,UITableViewDat
case 0:
let vc = ProgramCheckViewController()
vc.title = "考勤"
- vc.studentModel = self.studentModel
+ vc.studentModel = studentModel
self.navigationController?.pushViewController(vc, animated: true)
case 1:
let vc = ProgramCardViewController()
vc.title = "补卡"
- vc.studentData = self.studentModel
+ vc.studentData = studentModel
self.navigationController?.pushViewController(vc, animated: true)
case 2:
let vc = ProgramVacateViewController()
diff --git a/ParentAssistant/ParentAssistant/Classes/util/AccountManager.swift b/ParentAssistant/ParentAssistant/Classes/util/AccountManager.swift
index 6d4ad49..100b767 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/AccountManager.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/AccountManager.swift
@@ -57,6 +57,7 @@ class AccountManager: NSObject {
}
}
}
+ DebugLog(Setting.getUserInfo()?.dictionary)
return array
}
--
libgit2 0.21.0