Commit 2be432085bc19ad939fb4d0cfb5d68d443fa9f87
1 parent
62bfb79f
Exists in
parentassistant
no message
Showing
3 changed files
with
9 additions
and
11 deletions
Show diff stats
ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift
| @@ -34,7 +34,8 @@ class ReportViewController: UIViewController { | @@ -34,7 +34,8 @@ class ReportViewController: UIViewController { | ||
| 34 | imageV.contentMode = UIViewContentMode.scaleAspectFit | 34 | imageV.contentMode = UIViewContentMode.scaleAspectFit |
| 35 | EmptyView.addSubview(imageV) | 35 | EmptyView.addSubview(imageV) |
| 36 | self.view.addSubview(EmptyView) | 36 | self.view.addSubview(EmptyView) |
| 37 | - | 37 | + let backImage = UIImage(named: "navigationBar_backgrounImage") |
| 38 | + self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default) | ||
| 38 | if self.EmptyView.isHidden { | 39 | if self.EmptyView.isHidden { |
| 39 | //设置顶部按钮 | 40 | //设置顶部按钮 |
| 40 | setupNavigationBar() | 41 | setupNavigationBar() |
| @@ -44,14 +45,8 @@ class ReportViewController: UIViewController { | @@ -44,14 +45,8 @@ class ReportViewController: UIViewController { | ||
| 44 | } | 45 | } |
| 45 | // MARK: - 设置顶部按钮 | 46 | // MARK: - 设置顶部按钮 |
| 46 | func setupNavigationBar(){ | 47 | func setupNavigationBar(){ |
| 47 | - self.navigationController?.navigationBar.barStyle = UIBarStyle.default// UIColorFromRGB(0xC5DAFF) | ||
| 48 | - let backImage = UIImage(named: "navigationBar_backgrounImage") | ||
| 49 | - self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default) | ||
| 50 | - | ||
| 51 | self.configTheme() | 48 | self.configTheme() |
| 52 | - | ||
| 53 | setuptitleView() | 49 | setuptitleView() |
| 54 | - | ||
| 55 | } | 50 | } |
| 56 | func setuptitleView(){ | 51 | func setuptitleView(){ |
| 57 | 52 |
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
| @@ -527,10 +527,10 @@ | @@ -527,10 +527,10 @@ | ||
| 527 | </objects> | 527 | </objects> |
| 528 | <point key="canvasLocation" x="54" y="117"/> | 528 | <point key="canvasLocation" x="54" y="117"/> |
| 529 | </scene> | 529 | </scene> |
| 530 | - <!--Report View Controller--> | 530 | + <!--报告--> |
| 531 | <scene sceneID="YFU-9r-YrN"> | 531 | <scene sceneID="YFU-9r-YrN"> |
| 532 | <objects> | 532 | <objects> |
| 533 | - <viewController id="oqH-t7-mJp" customClass="ReportViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController"> | 533 | + <viewController title="报告" id="oqH-t7-mJp" customClass="ReportViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController"> |
| 534 | <view key="view" contentMode="scaleToFill" id="5aI-3l-uAy"> | 534 | <view key="view" contentMode="scaleToFill" id="5aI-3l-uAy"> |
| 535 | <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | 535 | <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
| 536 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | 536 | <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| @@ -769,7 +769,7 @@ | @@ -769,7 +769,7 @@ | ||
| 769 | </constraints> | 769 | </constraints> |
| 770 | <viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/> | 770 | <viewLayoutGuide key="safeArea" id="9O4-jf-dgu"/> |
| 771 | </view> | 771 | </view> |
| 772 | - <navigationItem key="navigationItem" id="dVv-mJ-714"/> | 772 | + <navigationItem key="navigationItem" title="报告" id="dVv-mJ-714"/> |
| 773 | <connections> | 773 | <connections> |
| 774 | <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/> | 774 | <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/> |
| 775 | </connections> | 775 | </connections> |
| @@ -1991,6 +1991,9 @@ | @@ -1991,6 +1991,9 @@ | ||
| 1991 | <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="uLq-9a-RVg"> | 1991 | <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="uLq-9a-RVg"> |
| 1992 | <rect key="frame" x="0.0" y="20" width="375" height="44"/> | 1992 | <rect key="frame" x="0.0" y="20" width="375" height="44"/> |
| 1993 | <autoresizingMask key="autoresizingMask"/> | 1993 | <autoresizingMask key="autoresizingMask"/> |
| 1994 | + <textAttributes key="titleTextAttributes"> | ||
| 1995 | + <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | ||
| 1996 | + </textAttributes> | ||
| 1994 | </navigationBar> | 1997 | </navigationBar> |
| 1995 | <nil name="viewControllers"/> | 1998 | <nil name="viewControllers"/> |
| 1996 | <connections> | 1999 | <connections> |
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <key>CFBundleShortVersionString</key> | 19 | <key>CFBundleShortVersionString</key> |
| 20 | <string>1.0.0</string> | 20 | <string>1.0.0</string> |
| 21 | <key>CFBundleVersion</key> | 21 | <key>CFBundleVersion</key> |
| 22 | - <string>9</string> | 22 | + <string>10</string> |
| 23 | <key>ITSAppUsesNonExemptEncryption</key> | 23 | <key>ITSAppUsesNonExemptEncryption</key> |
| 24 | <false/> | 24 | <false/> |
| 25 | <key>LSRequiresIPhoneOS</key> | 25 | <key>LSRequiresIPhoneOS</key> |