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

…t into parentassistant # Conflicts: # ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant # Conflicts: # ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
Cao yang
2 parents 396792ba 9df31148
Showing 3 changed files with 11 additions and 5 deletions Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
@@ -16,19 +16,25 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
     var channel:Int=0
     override func viewDidLoad() {
         super.viewDidLoad()
+
         self.configTheme()
  
+        // Do any additional setup after loading the view.
+        var searchViewFrame = CGRect(x: 0, y: 0, width: getScreenWidth()-100, height: 30)
+
         if isFirstviewController{
             self.navigationItem.title = ""
             addLeftBarBtn()
         }else{
-            
+            searchViewFrame.size.width = getScreenWidth()-60
         }
-        let searchView = UISearchBar(frame: CGRect(x: 0, y: 7, width: getScreenWidth()-40, height: 30))
+        let searchView = UISearchBar(frame: searchViewFrame)
+        let view = UIView(frame: CGRect(x: 0, y: 7, width: searchViewFrame.size.width, height: 30))
         searchView.delegate = self
         searchView.placeholder = "请输入搜索内容"
         searchView.showsCancelButton = false
-        self.navigationItem.titleView = searchView
+        view.addSubview(searchView)
+        self.navigationItem.titleView = view
         self.navigationController?.navigationBar.tintColor=UIColor.white
     }
  
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
...	...	@@ -16,19 +16,25 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
16	16	var channel:Int=0
17	17	override func viewDidLoad() {
18	18	super.viewDidLoad()
	19	+
19	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	25	if isFirstviewController{
22	26	self.navigationItem.title = ""
23	27	addLeftBarBtn()
24	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	33	searchView.delegate = self
29	34	searchView.placeholder = "请输入搜索内容"
30	35	searchView.showsCancelButton = false
31		- self.navigationItem.titleView = searchView
	36	+ view.addSubview(searchView)
	37	+ self.navigationItem.titleView = view
32	38	self.navigationController?.navigationBar.tintColor=UIColor.white
33	39	}
34	40
...	...
...	...	@@ -17,9 +17,9 @@
17	17	<key>CFBundlePackageType</key>
18	18	<string>APPL</string>
19	19	<key>CFBundleShortVersionString</key>
20		- <string>1.0.0</string>
	20	+ <string>1.0.1</string>
21	21	<key>CFBundleVersion</key>
22		- <string>10</string>
	22	+ <string>13</string>
23	23	<key>ITSAppUsesNonExemptEncryption</key>
24	24	<false/>
25	25	<key>LSRequiresIPhoneOS</key>
...	...