IOSGroup / ParentAssistant

Download as
Browse Code »

Commit 98a07100e1b1588e9d93136c6d5e2c64052c568c

Authored by Cao yang
2 parents 396792ba 9df31148
Exists in parentassistant

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… 

…t into parentassistant

# Conflicts:
#	ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
Showing 3 changed files with 11 additions and 5 deletions   Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
View file @98a0710
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
  Diff comments   View file @98a0710
@@ -16,19 +16,25 @@ class InformationViewController: UIViewController,UISearchBarDelegate { @@ -16,19 +16,25 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
16 var channel:Int=0 16 var channel:Int=0
17 override func viewDidLoad() { 17 override func viewDidLoad() {
18 super.viewDidLoad() 18 super.viewDidLoad()
  19 +
19 self.configTheme() 20 self.configTheme()
20 21
  22 + // Do any additional setup after loading the view.
  23 + var searchViewFrame = CGRect(x: 0, y: 0, width: getScreenWidth()-100, height: 30)
  24 +
21 if isFirstviewController{ 25 if isFirstviewController{
22 self.navigationItem.title = "" 26 self.navigationItem.title = ""
23 addLeftBarBtn() 27 addLeftBarBtn()
24 }else{ 28 }else{
25 - 29 + searchViewFrame.size.width = getScreenWidth()-60
26 } 30 }
27 - let searchView = UISearchBar(frame: CGRect(x: 0, y: 7, width: getScreenWidth()-40, height: 30)) 31 + let searchView = UISearchBar(frame: searchViewFrame)
  32 + let view = UIView(frame: CGRect(x: 0, y: 7, width: searchViewFrame.size.width, height: 30))
28 searchView.delegate = self 33 searchView.delegate = self
29 searchView.placeholder = "请输入搜索内容" 34 searchView.placeholder = "请输入搜索内容"
30 searchView.showsCancelButton = false 35 searchView.showsCancelButton = false
31 - self.navigationItem.titleView = searchView 36 + view.addSubview(searchView)
  37 + self.navigationItem.titleView = view
32 self.navigationController?.navigationBar.tintColor=UIColor.white 38 self.navigationController?.navigationBar.tintColor=UIColor.white
33 } 39 }
34 40
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
  Diff comments   View file @98a0710
@@ -17,9 +17,9 @@ @@ -17,9 +17,9 @@
17 <key>CFBundlePackageType</key> 17 <key>CFBundlePackageType</key>
18 <string>APPL</string> 18 <string>APPL</string>
19 <key>CFBundleShortVersionString</key> 19 <key>CFBundleShortVersionString</key>
20 - <string>1.0.0</string> 20 + <string>1.0.1</string>
21 <key>CFBundleVersion</key> 21 <key>CFBundleVersion</key>
22 - <string>10</string> 22 + <string>13</string>
23 <key>ITSAppUsesNonExemptEncryption</key> 23 <key>ITSAppUsesNonExemptEncryption</key>
24 <false/> 24 <false/>
25 <key>LSRequiresIPhoneOS</key> 25 <key>LSRequiresIPhoneOS</key>