IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 1b6a59e6e30dd851201cfda85c452f747c2f45ec

Authored by Cao yang
1 parent 92150d26
Exists in parentassistant

修改家长慧需求,修复已知bug

Showing 6 changed files with 78 additions and 15 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @1b6a59e
No preview for this file type
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  Diff comments   View file @1b6a59e
@@ -13,5 +13,69 @@ @@ -13,5 +13,69 @@
13 stopOnStyle = "0"> 13 stopOnStyle = "0">
14 </BreakpointContent> 14 </BreakpointContent>
15 </BreakpointProxy> 15 </BreakpointProxy>
  16 + <BreakpointProxy
  17 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  18 + <BreakpointContent
  19 + shouldBeEnabled = "No"
  20 + ignoreCount = "0"
  21 + continueAfterRunningActions = "No"
  22 + filePath = "ParentAssistant/Classes/controllers/Grow/GrowViewController.swift"
  23 + timestampString = "548589251.1327029"
  24 + startingColumnNumber = "9223372036854775807"
  25 + endingColumnNumber = "9223372036854775807"
  26 + startingLineNumber = "187"
  27 + endingLineNumber = "187"
  28 + landmarkName = "switchChildrenAction()"
  29 + landmarkType = "7">
  30 + </BreakpointContent>
  31 + </BreakpointProxy>
  32 + <BreakpointProxy
  33 + BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
  34 + <BreakpointContent
  35 + shouldBeEnabled = "Yes"
  36 + ignoreCount = "0"
  37 + continueAfterRunningActions = "No"
  38 + filePath = "ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift"
  39 + timestampString = "548589381.889563"
  40 + startingColumnNumber = "9223372036854775807"
  41 + endingColumnNumber = "9223372036854775807"
  42 + startingLineNumber = "104"
  43 + endingLineNumber = "104"
  44 + landmarkName = "unbundlingAction(indexPath:)"
  45 + landmarkType = "7">
  46 + <Locations>
  47 + <Location
  48 + shouldBeEnabled = "Yes"
  49 + ignoreCount = "0"
  50 + continueAfterRunningActions = "No"
  51 + symbolName = "ParentAssistant.MyChildrenViewController.unbundlingAction(indexPath: Foundation.IndexPath) -&gt; ()"
  52 + moduleName = "ParentAssistant"
  53 + usesParentBreakpointCondition = "Yes"
  54 + urlString = "file:///Users/caoyang/Documents/ParentAssistant/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift"
  55 + timestampString = "548589382.602811"
  56 + startingColumnNumber = "9223372036854775807"
  57 + endingColumnNumber = "9223372036854775807"
  58 + startingLineNumber = "104"
  59 + endingLineNumber = "104"
  60 + offsetFromSymbolStart = "75">
  61 + </Location>
  62 + <Location
  63 + shouldBeEnabled = "Yes"
  64 + ignoreCount = "0"
  65 + continueAfterRunningActions = "No"
  66 + symbolName = "closure #1 (Swift.Optional&lt;Swift.String&gt;, Swift.Optional&lt;__ObjC.NSError&gt;) -&gt; () in ParentAssistant.MyChildrenViewController.unbundlingAction(indexPath: Foundation.IndexPath) -&gt; ()"
  67 + moduleName = "ParentAssistant"
  68 + usesParentBreakpointCondition = "Yes"
  69 + urlString = "file:///Users/caoyang/Documents/ParentAssistant/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift"
  70 + timestampString = "548589382.606685"
  71 + startingColumnNumber = "9223372036854775807"
  72 + endingColumnNumber = "9223372036854775807"
  73 + startingLineNumber = "105"
  74 + endingLineNumber = "105"
  75 + offsetFromSymbolStart = "102">
  76 + </Location>
  77 + </Locations>
  78 + </BreakpointContent>
  79 + </BreakpointProxy>
16 </Breakpoints> 80 </Breakpoints>
17 </Bucket> 81 </Bucket>
ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
  Diff comments   View file @1b6a59e
@@ -117,10 +117,11 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { @@ -117,10 +117,11 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
117 if array.isEmpty { 117 if array.isEmpty {
118 title = "未绑定" 118 title = "未绑定"
119 }else{ 119 }else{
120 - title = array[0].studentName  
121 let index = UserDefaults.standard.value(forKey: "SELECT_CHILDREN") as? Int 120 let index = UserDefaults.standard.value(forKey: "SELECT_CHILDREN") as? Int
122 if index == nil { 121 if index == nil {
123 UserDefaults.standard.set(0, forKey: "SELECT_CHILDREN") 122 UserDefaults.standard.set(0, forKey: "SELECT_CHILDREN")
  123 + }else{
  124 + title = array[index!].studentName
124 } 125 }
125 } 126 }
126 }else{ 127 }else{
@@ -184,6 +185,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { @@ -184,6 +185,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
184 view.AlertBlock = { index in 185 view.AlertBlock = { index in
185 //MARK:缓存孩子索引 186 //MARK:缓存孩子索引
186 UserDefaults.standard.set(index, forKey: "SELECT_CHILDREN") 187 UserDefaults.standard.set(index, forKey: "SELECT_CHILDREN")
  188 + self.titleLeftLab.text = arr[index].studentName
187 } 189 }
188 }else{ 190 }else{
189 let alertView = UIAlertController.init(title: "提示", message: "您尚未绑定孩子信息,是否前往绑定?", preferredStyle: UIAlertControllerStyle.alert) 191 let alertView = UIAlertController.init(title: "提示", message: "您尚未绑定孩子信息,是否前往绑定?", preferredStyle: UIAlertControllerStyle.alert)
ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
  Diff comments   View file @1b6a59e
@@ -51,6 +51,10 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate { @@ -51,6 +51,10 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
51 let isSuccess = JSON.fromString(backData)!["data"].boolValue 51 let isSuccess = JSON.fromString(backData)!["data"].boolValue
52 if isSuccess{ 52 if isSuccess{
53 self.view.makeToast("补卡成功!", duration: 2, position: self.view.center) 53 self.view.makeToast("补卡成功!", duration: 2, position: self.view.center)
  54 + let mobile = UserDefaults.standard.value(forKey: "user_phone") as! String
  55 + AccountManager.shared.refreshUserInfo(mobile, completionHandler: { (isScess) in
  56 +
  57 + })
54 }else{ 58 }else{
55 self.view.makeToast("补卡失败!", duration: 2, position: self.view.center) 59 self.view.makeToast("补卡失败!", duration: 2, position: self.view.center)
56 } 60 }
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/Login/LoginViewController.swift
  Diff comments   View file @1b6a59e
@@ -123,9 +123,6 @@ class LoginViewController: UITableViewController,UITextFieldDelegate { @@ -123,9 +123,6 @@ class LoginViewController: UITableViewController,UITextFieldDelegate {
123 self.gotoLoginAction() 123 self.gotoLoginAction()
124 }else{ 124 }else{
125 appDelegate.window?.makeToast("账号未注册") 125 appDelegate.window?.makeToast("账号未注册")
126 -// if let message = JSON.fromString(backData)!["message"].string{  
127 -// appDelegate.window?.makeToast(message, duration: 1, position: nil)  
128 -// }  
129 } 126 }
130 } 127 }
131 } 128 }
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
  Diff comments   View file @1b6a59e
@@ -224,17 +224,13 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{ @@ -224,17 +224,13 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{
224 }else{ 224 }else{
225 appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) 225 appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
226 } 226 }
227 - case 3://我的孩子  
228 -  
229 - let vc = BindlingSuccessViewController()  
230 - self.navigationController?.pushViewController(vc, animated: true)  
231 -  
232 -// if AccountManager.shared.isOnline() {  
233 -// let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController  
234 -// self.navigationController?.pushViewController(vc, animated: true)  
235 -// }else{  
236 -// appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)  
237 -// } 227 + case 3://我的孩子
  228 + if AccountManager.shared.isOnline() {
  229 + let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController
  230 + self.navigationController?.pushViewController(vc, animated: true)
  231 + }else{
  232 + appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter)
  233 + }
238 case 5://意见与反馈 234 case 5://意见与反馈
239 let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController 235 let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController
240 vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)" 236 vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)"