fix navigation bug below ios 11
共有 25 个文件被更改，包括 158 次插入 和 176 次删除
二进制
PaiAi/Paiai.xcodeproj/project.xcworkspace/xcuserdata/FFIB.xcuserdatad/UserInterfaceState.xcuserstate
+ 0
- 12
PaiAi/Paiai.xcodeproj/xcuserdata/FFIB.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,16 +2,4 @@ |
||
| 2 | 2 |
<Bucket |
| 3 | 3 |
type = "1" |
| 4 | 4 |
version = "2.0"> |
| 5 |
- <Breakpoints> |
|
| 6 |
- <BreakpointProxy |
|
| 7 |
- BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint"> |
|
| 8 |
- <BreakpointContent |
|
| 9 |
- shouldBeEnabled = "Yes" |
|
| 10 |
- ignoreCount = "0" |
|
| 11 |
- continueAfterRunningActions = "No" |
|
| 12 |
- scope = "0" |
|
| 13 |
- stopOnStyle = "0"> |
|
| 14 |
- </BreakpointContent> |
|
| 15 |
- </BreakpointProxy> |
|
| 16 |
- </Breakpoints> |
|
| 17 | 5 |
</Bucket> |
+ 1
- 4
PaiAi/Paiai/AppDelegate.swift
@@ -41,10 +41,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
|
||
| 41 | 41 |
|
| 42 | 42 |
coordinator = AppCoordinator(rootViewController, navigationController: nav) |
| 43 | 43 |
|
| 44 |
- nav.navigationBar.tintColor = UIColor.white |
|
| 45 |
- nav.navigationBar.setBackgroundImage(UIImage.Navigation.background, for: .default) |
|
| 46 |
- nav.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white.cgColor] |
|
| 47 |
- nav.navigationBar.shadowImage = UIImage() |
|
| 44 |
+ |
|
| 48 | 45 |
return true |
| 49 | 46 |
} |
| 50 | 47 |
|
+ 2
- 2
PaiAi/PaiaiUIKit/Reusable/UIKit/NavigationBack/NavigationBackItemDelegate.swift
@@ -6,9 +6,9 @@ |
||
| 6 | 6 |
// Copyright © 2019 yb. All rights reserved. |
| 7 | 7 |
// |
| 8 | 8 |
|
| 9 |
-import Foundation |
|
| 9 |
+import UIKit |
|
| 10 | 10 |
|
| 11 |
-public protocol NavigationBackViewController e: class {
|
|
| 11 |
+public protocol NavigationBackViewController: class {
|
|
| 12 | 12 |
func setupNavigationBackItem() |
| 13 | 13 |
} |
| 14 | 14 |
|
+ 1
- 1
PaiAi/PaiaiUIKit/Reusable/UIKit/NavigationBack/UINavigationController + NavigationBack.swift
@@ -6,7 +6,7 @@ |
||
| 6 | 6 |
// Copyright © 2019 FFIB. All rights reserved. |
| 7 | 7 |
// |
| 8 | 8 |
|
| 9 |
-import Foundation |
|
| 9 |
+import UIKit |
|
| 10 | 10 |
|
| 11 | 11 |
public extension UINavigationController {
|
| 12 | 12 |
func pushViewController<T: UIViewController & NavigationBackViewController>(_ vc: T, animted: Bool = true) {
|
+ 0
- 2
PaiAi/PaiaiUIKit/Reusable/UIKit/NavigationController/NavigationController.swift
@@ -12,8 +12,6 @@ public class NavigationController: UINavigationController {
|
||
| 12 | 12 |
|
| 13 | 13 |
override public init(rootViewController: UIViewController) {
|
| 14 | 14 |
super.init(navigationBarClass: NavigationBar.classForCoder(), toolbarClass: nil) |
| 15 |
-// super.init(rootViewController: rootViewController) |
|
| 16 |
-// navigationBar.delegate = self |
|
| 17 | 15 |
self.viewControllers = [rootViewController] |
| 18 | 16 |
} |
| 19 | 17 |
|
+ 15
- 14
PaiAi/PaiaiUIKit/Reusable/UIKit/PageViewController/PageViewController.swift
@@ -137,6 +137,7 @@ fileprivate extension PageViewController {
|
||
| 137 | 137 |
guard !pageItems.isEmpty else { return }
|
| 138 | 138 |
|
| 139 | 139 |
var last: UILabel? |
| 140 |
+ var width: CGFloat = 0 |
|
| 140 | 141 |
for (i, item) in pageItems.enumerated() {
|
| 141 | 142 |
let label = UILabel() |
| 142 | 143 |
label.text = item.title |
@@ -148,15 +149,6 @@ fileprivate extension PageViewController {
|
||
| 148 | 149 |
|
| 149 | 150 |
menuView.addSubview(label) |
| 150 | 151 |
|
| 151 |
- let left: NSLayoutConstraint |
|
| 152 |
- if let lastLabel = last {
|
|
| 153 |
- left = label.leftAnchor.constraint(equalTo: lastLabel.rightAnchor, constant: option.spacing) |
|
| 154 |
- } else {
|
|
| 155 |
- left = label.leadingAnchor.constraint(equalTo: menuView.leadingAnchor) |
|
| 156 |
- } |
|
| 157 |
- |
|
| 158 |
- let centerY = label.centerYAnchor.constraint(equalTo: menuView.centerYAnchor) |
|
| 159 |
- |
|
| 160 | 152 |
if i == 0 {
|
| 161 | 153 |
label.textColor = option.selectedColor |
| 162 | 154 |
label.font = UIFont.systemFont(ofSize: option.font.pointSize + 1) |
@@ -166,19 +158,29 @@ fileprivate extension PageViewController {
|
||
| 166 | 158 |
.constraint(equalTo: menuView.trailingAnchor)]) |
| 167 | 159 |
} |
| 168 | 160 |
|
| 169 |
- NSLayoutConstraint.activate([left, centerY]) |
|
| 161 |
+ NSLayoutConstraint.activate([ |
|
| 162 |
+ label.leadingAnchor.constraint(equalTo: last?.trailingAnchor ?? menuView.leadingAnchor, constant: last == nil ? 0 : option.spacing), |
|
| 163 |
+ label.centerYAnchor.constraint(equalTo: menuView.centerYAnchor)]) |
|
| 170 | 164 |
last = label |
| 165 |
+ |
|
| 166 |
+ if #available(iOS 11, *) { continue }
|
|
| 167 |
+ label.sizeToFit() |
|
| 168 |
+ width += label.frame.width |
|
| 171 | 169 |
} |
| 172 |
- |
|
| 173 | 170 |
setSliderViewDetail() |
| 171 |
+ |
|
| 172 |
+ if #available(iOS 11, *) { return }
|
|
| 173 |
+ menuView.frame.size = CGSize(width: width + CGFloat(pageItems.count - 1) * option.spacing, height: 40) |
|
| 174 | 174 |
} |
| 175 | 175 |
|
| 176 | 176 |
func setSliderViewDetail() {
|
| 177 | 177 |
guard let label = menuView.viewWithTag(baseTag) else { return }
|
| 178 | 178 |
sliderConstraint = sliderView.centerXAnchor.constraint(equalTo: label.centerXAnchor) |
| 179 |
+ NSLayoutConstraint.activate([sliderConstraint!]) |
|
| 179 | 180 |
|
| 180 |
- NSLayoutConstraint.activate([sliderConstraint!, |
|
| 181 |
- sliderView.topAnchor.constraint(equalTo: label.bottomAnchor, constant: 6)]) |
|
| 181 |
+ if #available(iOS 11, *) {
|
|
| 182 |
+ NSLayoutConstraint.activate([sliderView.topAnchor.constraint(equalTo: label.bottomAnchor, constant: 6)]) |
|
| 183 |
+ } |
|
| 182 | 184 |
} |
| 183 | 185 |
} |
| 184 | 186 |
|
@@ -203,7 +205,6 @@ fileprivate extension PageViewController {
|
||
| 203 | 205 |
} |
| 204 | 206 |
|
| 205 | 207 |
func activateConstraintsSliderView() {
|
| 206 |
- |
|
| 207 | 208 |
sliderView.translatesAutoresizingMaskIntoConstraints = false |
| 208 | 209 |
|
| 209 | 210 |
NSLayoutConstraint.activate([ |
+ 13
- 3
PaiAi/Paiai_iOS/App/ContainerViewController.swift
@@ -50,7 +50,7 @@ public final class ContainerViewController: PageViewController {
|
||
| 50 | 50 |
/// life circle |
| 51 | 51 |
override public func viewDidLoad() {
|
| 52 | 52 |
super.viewDidLoad() |
| 53 |
- makeNavigationBar() |
|
| 53 |
+ setupNavigationBar() |
|
| 54 | 54 |
bindInteraction() |
| 55 | 55 |
} |
| 56 | 56 |
|
@@ -59,14 +59,24 @@ public final class ContainerViewController: PageViewController {
|
||
| 59 | 59 |
bindLoggedInInteraction() |
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 |
- func makeNavigationBar() {
|
|
| 62 |
+ func setupNavigationBar() {
|
|
| 63 |
+ navigationController?.navigationBar.shadowImage = UIImage() |
|
| 64 |
+ navigationController?.navigationBar.tintColor = UIColor.white |
|
| 65 |
+ navigationController?.navigationBar.barTintColor = UIColor.white |
|
| 66 |
+ navigationController?.navigationBar.titleTextAttributes = [.foregroundColor: UIColor.white] |
|
| 67 |
+ navigationController?.navigationBar.setBackgroundImage(UIImage.Navigation.background, for: .default) |
|
| 68 |
+ |
|
| 63 | 69 |
constructNavigationViewHierarchy() |
| 64 | 70 |
} |
| 65 | 71 |
|
| 66 | 72 |
func constructNavigationViewHierarchy() {
|
| 67 | 73 |
navigationContentView.addSubview(iconView) |
| 68 | 74 |
navigationContentView.addSubview(headerView) |
| 69 |
- navigationItem.leftBarButtonItem = UIBarButtonItem(customView: navigationContentView) |
|
| 75 |
+ let leftItem = UIBarButtonItem(customView: navigationContentView) |
|
| 76 |
+ let spaceItem = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) |
|
| 77 |
+ spaceItem.width = -15 |
|
| 78 |
+ |
|
| 79 |
+ navigationItem.leftBarButtonItems = [spaceItem, leftItem] |
|
| 70 | 80 |
} |
| 71 | 81 |
} |
| 72 | 82 |
|
+ 3
- 4
PaiAi/Paiai_iOS/App/Group/Group.storyboard
@@ -1,11 +1,11 @@ |
||
| 1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2 |
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 2 |
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 3 | 3 |
<device id="retina4_7" orientation="portrait"> |
| 4 | 4 |
<adaptation id="fullscreen"/> |
| 5 | 5 |
</device> |
| 6 | 6 |
<dependencies> |
| 7 | 7 |
<deployment identifier="iOS"/> |
| 8 |
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> |
|
| 8 |
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> |
|
| 9 | 9 |
<capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 10 | 10 |
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| 11 | 11 |
</dependencies> |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 |
<constraint firstAttribute="width" constant="64" id="kEi-cK-cxH"/> |
| 49 | 49 |
</constraints> |
| 50 | 50 |
<state key="normal" image="BTN-camera"/> |
| 51 |
- <state key="selected" image="BTN-拍照-press"/> |
|
| 51 |
+ <state key="selected" image="BTN-camera"/> |
|
| 52 | 52 |
<connections> |
| 53 | 53 |
<action selector="takePhotoAction" destination="qPy-31-33I" eventType="touchUpInside" id="vIP-Gk-vDZ"/> |
| 54 | 54 |
</connections> |
@@ -83,6 +83,5 @@ |
||
| 83 | 83 |
</scenes> |
| 84 | 84 |
<resources> |
| 85 | 85 |
<image name="BTN-camera" width="168" height="168"/> |
| 86 |
- <image name="BTN-拍照-press" width="16" height="16"/> |
|
| 87 | 86 |
</resources> |
| 88 | 87 |
</document> |
+ 27
- 31
PaiAi/Paiai_iOS/App/Group/GroupDetail/GroupDetail.storyboard
@@ -1,11 +1,7 @@ |
||
| 1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2 |
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 3 |
- <device id="retina4_7" orientation="portrait"> |
|
| 4 |
- <adaptation id="fullscreen"/> |
|
| 5 |
- </device> |
|
| 2 |
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 6 | 3 |
<dependencies> |
| 7 |
- <deployment identifier="iOS"/> |
|
| 8 |
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> |
|
| 4 |
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> |
|
| 9 | 5 |
<capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 10 | 6 |
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| 11 | 7 |
</dependencies> |
@@ -15,14 +11,14 @@ |
||
| 15 | 11 |
<objects> |
| 16 | 12 |
<viewController storyboardIdentifier="GroupDetailViewController" id="s9X-RR-Rat" userLabel="GroupDetailViewController" customClass="GroupDetailViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 17 | 13 |
<view key="view" contentMode="scaleToFill" id="OXa-NJ-XOO"> |
| 18 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 14 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 19 | 15 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 20 | 16 |
<subviews> |
| 21 | 17 |
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="eF5-Vm-thF"> |
| 22 |
- <rect key="frame" x="0.0" y="20" width="375" height="225"/> |
|
| 18 |
+ <rect key="frame" x="0.0" y="20" width="414" height="225"/> |
|
| 23 | 19 |
<subviews> |
| 24 | 20 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3DP-6l-tA7" userLabel="Group Name"> |
| 25 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="45"/> |
|
| 21 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="45"/> |
|
| 26 | 22 |
<subviews> |
| 27 | 23 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EgZ-Rf-o71"> |
| 28 | 24 |
<rect key="frame" x="12" y="13" width="49" height="19.5"/> |
@@ -32,14 +28,14 @@ |
||
| 32 | 28 |
<nil key="highlightedColor"/> |
| 33 | 29 |
</label> |
| 34 | 30 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sv7-52-SPp"> |
| 35 |
- <rect key="frame" x="329" y="22.5" width="0.0" height="0.0"/> |
|
| 31 |
+ <rect key="frame" x="376" y="22.5" width="0.0" height="0.0"/> |
|
| 36 | 32 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 37 | 33 |
<fontDescription key="fontDescription" type="system" pointSize="16"/> |
| 38 | 34 |
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 39 | 35 |
<nil key="highlightedColor"/> |
| 40 | 36 |
</label> |
| 41 | 37 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="i8n-NV-HOx"> |
| 42 |
- <rect key="frame" x="339" y="4.5" width="24" height="36"/> |
|
| 38 |
+ <rect key="frame" x="386" y="14.5" width="16" height="16"/> |
|
| 43 | 39 |
</imageView> |
| 44 | 40 |
</subviews> |
| 45 | 41 |
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
@@ -58,10 +54,10 @@ |
||
| 58 | 54 |
</connections> |
| 59 | 55 |
</view> |
| 60 | 56 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NxF-oL-8bw" userLabel="Group Member"> |
| 61 |
- <rect key="frame" x="0.0" y="45" width="375" height="90"/> |
|
| 57 |
+ <rect key="frame" x="0.0" y="45" width="414" height="90"/> |
|
| 62 | 58 |
<subviews> |
| 63 | 59 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jUc-1D-3th"> |
| 64 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="45"/> |
|
| 60 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="45"/> |
|
| 65 | 61 |
<subviews> |
| 66 | 62 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群成员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tpV-44-bE1"> |
| 67 | 63 |
<rect key="frame" x="12" y="13" width="49" height="19.5"/> |
@@ -71,14 +67,14 @@ |
||
| 71 | 67 |
<nil key="highlightedColor"/> |
| 72 | 68 |
</label> |
| 73 | 69 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HZE-FN-DyQ"> |
| 74 |
- <rect key="frame" x="299.5" y="13" width="33.5" height="19.5"/> |
|
| 70 |
+ <rect key="frame" x="346.5" y="13" width="33.5" height="19.5"/> |
|
| 75 | 71 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 76 | 72 |
<fontDescription key="fontDescription" type="system" pointSize="16"/> |
| 77 | 73 |
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 78 | 74 |
<nil key="highlightedColor"/> |
| 79 | 75 |
</label> |
| 80 | 76 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="0KU-Hj-GCy"> |
| 81 |
- <rect key="frame" x="339" y="4.5" width="24" height="36"/> |
|
| 77 |
+ <rect key="frame" x="386" y="14.5" width="16" height="16"/> |
|
| 82 | 78 |
</imageView> |
| 83 | 79 |
</subviews> |
| 84 | 80 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
@@ -93,7 +89,7 @@ |
||
| 93 | 89 |
</constraints> |
| 94 | 90 |
</view> |
| 95 | 91 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gAe-sP-K7J" customClass="GroupDetailMemeberView" customModule="Paiai_iOS" customModuleProvider="target"> |
| 96 |
- <rect key="frame" x="0.0" y="45" width="375" height="45"/> |
|
| 92 |
+ <rect key="frame" x="0.0" y="45" width="414" height="45"/> |
|
| 97 | 93 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
| 98 | 94 |
<constraints> |
| 99 | 95 |
<constraint firstAttribute="height" constant="45" id="jsl-Zu-k11"/> |
@@ -115,7 +111,7 @@ |
||
| 115 | 111 |
</connections> |
| 116 | 112 |
</view> |
| 117 | 113 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mdq-nz-jXt" userLabel="Group QR"> |
| 118 |
- <rect key="frame" x="0.0" y="135" width="375" height="45"/> |
|
| 114 |
+ <rect key="frame" x="0.0" y="135" width="414" height="45"/> |
|
| 119 | 115 |
<subviews> |
| 120 | 116 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群二维码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lfa-Ov-NXG"> |
| 121 | 117 |
<rect key="frame" x="12" y="13" width="65.5" height="19.5"/> |
@@ -125,10 +121,10 @@ |
||
| 125 | 121 |
<nil key="highlightedColor"/> |
| 126 | 122 |
</label> |
| 127 | 123 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="IXn-b1-K62"> |
| 128 |
- <rect key="frame" x="339" y="4.5" width="24" height="36"/> |
|
| 124 |
+ <rect key="frame" x="386" y="14.5" width="16" height="16"/> |
|
| 129 | 125 |
</imageView> |
| 130 | 126 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-QR" translatesAutoresizingMaskIntoConstraints="NO" id="NsS-cG-FY5"> |
| 131 |
- <rect key="frame" x="305" y="10.5" width="24" height="24"/> |
|
| 127 |
+ <rect key="frame" x="352" y="10.5" width="24" height="24"/> |
|
| 132 | 128 |
<constraints> |
| 133 | 129 |
<constraint firstAttribute="width" constant="24" id="YQf-I7-DB5"/> |
| 134 | 130 |
<constraint firstAttribute="height" constant="24" id="pu8-YH-Lmv"/> |
@@ -150,10 +146,10 @@ |
||
| 150 | 146 |
</connections> |
| 151 | 147 |
</view> |
| 152 | 148 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="euC-CX-gvx" userLabel="Group Lock"> |
| 153 |
- <rect key="frame" x="0.0" y="180" width="375" height="45"/> |
|
| 149 |
+ <rect key="frame" x="0.0" y="180" width="414" height="45"/> |
|
| 154 | 150 |
<subviews> |
| 155 | 151 |
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BHD-pt-RTg"> |
| 156 |
- <rect key="frame" x="314" y="7" width="51" height="31"/> |
|
| 152 |
+ <rect key="frame" x="353" y="7" width="51" height="31"/> |
|
| 157 | 153 |
<color key="onTintColor" red="0.97647058819999999" green="0.34901960780000002" blue="0.50196078430000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 158 | 154 |
<connections> |
| 159 | 155 |
<action selector="changeSwitch" destination="s9X-RR-Rat" eventType="valueChanged" id="hmQ-IO-RLr"/> |
@@ -167,7 +163,7 @@ |
||
| 167 | 163 |
<nil key="highlightedColor"/> |
| 168 | 164 |
</label> |
| 169 | 165 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群未锁定，可以邀请新成员加入" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="3Yr-Gn-GlA"> |
| 170 |
- <rect key="frame" x="77" y="15.5" width="221" height="17"/> |
|
| 166 |
+ <rect key="frame" x="77" y="15.5" width="260" height="17"/> |
|
| 171 | 167 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 172 | 168 |
<fontDescription key="fontDescription" type="system" pointSize="14"/> |
| 173 | 169 |
<color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
@@ -230,11 +226,11 @@ |
||
| 230 | 226 |
<objects> |
| 231 | 227 |
<viewController storyboardIdentifier="GroupNameModificationViewController" id="xy6-fJ-25c" userLabel="GroupNameModificationViewController" customClass="GroupNameModificationViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 232 | 228 |
<view key="view" contentMode="scaleToFill" id="k0W-jb-XQ1"> |
| 233 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 229 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 234 | 230 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 235 | 231 |
<subviews> |
| 236 | 232 |
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="群名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8A1-xH-nsg"> |
| 237 |
- <rect key="frame" x="0.0" y="20" width="375" height="44"/> |
|
| 233 |
+ <rect key="frame" x="0.0" y="20" width="414" height="44"/> |
|
| 238 | 234 |
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 239 | 235 |
<constraints> |
| 240 | 236 |
<constraint firstAttribute="height" constant="44" id="K1B-yr-x1W"/> |
@@ -243,7 +239,7 @@ |
||
| 243 | 239 |
<textInputTraits key="textInputTraits"/> |
| 244 | 240 |
</textField> |
| 245 | 241 |
<button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6ys-SB-QLv"> |
| 246 |
- <rect key="frame" x="0.0" y="94" width="375" height="48"/> |
|
| 242 |
+ <rect key="frame" x="0.0" y="94" width="414" height="48"/> |
|
| 247 | 243 |
<constraints> |
| 248 | 244 |
<constraint firstAttribute="height" constant="48" id="VPL-IJ-M2Y"/> |
| 249 | 245 |
</constraints> |
@@ -291,22 +287,22 @@ |
||
| 291 | 287 |
<objects> |
| 292 | 288 |
<viewController storyboardIdentifier="GroupMemberViewController" id="DUe-lx-JN1" userLabel="GroupMemberViewController" customClass="GroupMemberViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 293 | 289 |
<view key="view" contentMode="scaleToFill" id="wjV-Cy-YkZ"> |
| 294 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 290 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 295 | 291 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 296 | 292 |
<subviews> |
| 297 | 293 |
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="cas-Ep-jsP"> |
| 298 |
- <rect key="frame" x="0.0" y="20" width="375" height="647"/> |
|
| 294 |
+ <rect key="frame" x="0.0" y="20" width="414" height="876"/> |
|
| 299 | 295 |
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 300 | 296 |
<color key="separatorColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 301 | 297 |
<prototypes> |
| 302 | 298 |
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="groupMemberCell" rowHeight="50" id="DJ1-Ig-ZYH" customClass="GroupMemberCell" customModule="Paiai_iOS" customModuleProvider="target"> |
| 303 |
- <rect key="frame" x="0.0" y="28" width="375" height="50"/> |
|
| 299 |
+ <rect key="frame" x="0.0" y="28" width="414" height="50"/> |
|
| 304 | 300 |
<autoresizingMask key="autoresizingMask"/> |
| 305 | 301 |
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DJ1-Ig-ZYH" id="IJX-qw-roh"> |
| 306 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/> |
|
| 302 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="49.5"/> |
|
| 307 | 303 |
<autoresizingMask key="autoresizingMask"/> |
| 308 | 304 |
<subviews> |
| 309 |
- <imageView userInteractionEnabled="NO" tag="1001" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="默认头像" translatesAutoresizingMaskIntoConstraints="NO" id="tMW-3x-NKp"> |
|
| 305 |
+ <imageView userInteractionEnabled="NO" tag="1001" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar" translatesAutoresizingMaskIntoConstraints="NO" id="tMW-3x-NKp"> |
|
| 310 | 306 |
<rect key="frame" x="61" y="7" width="36" height="36"/> |
| 311 | 307 |
<constraints> |
| 312 | 308 |
<constraint firstAttribute="width" constant="36" id="LWD-BD-bsB"/> |
@@ -398,9 +394,9 @@ |
||
| 398 | 394 |
</scenes> |
| 399 | 395 |
<resources> |
| 400 | 396 |
<image name="BTN-delete" width="66" height="66"/> |
| 397 |
+ <image name="defaultAvatar" width="16" height="16"/> |
|
| 401 | 398 |
<image name="list-QR" width="36" height="36"/> |
| 402 | 399 |
<image name="list-arrow" width="24" height="36"/> |
| 403 | 400 |
<image name="navigation-background" width="12" height="132"/> |
| 404 |
- <image name="默认头像" width="240" height="240"/> |
|
| 405 | 401 |
</resources> |
| 406 | 402 |
</document> |
+ 1
- 1
PaiAi/Paiai_iOS/App/Group/GroupDetail/GroupDetailViewController.swift
@@ -28,7 +28,7 @@ final class GroupDetailViewController: UIViewController {
|
||
| 28 | 28 |
super.viewDidLoad() |
| 29 | 29 |
binding() |
| 30 | 30 |
viewModel.reload() |
| 31 |
- title = "群资料" |
|
| 31 |
+ navigationItem.title = "群资料" |
|
| 32 | 32 |
setRightBarButtonItems() |
| 33 | 33 |
} |
| 34 | 34 |
|
+ 1
- 1
PaiAi/Paiai_iOS/App/Group/GroupDetail/GroupMemberViewController.swift
@@ -23,7 +23,7 @@ final class GroupMemberViewController: UIViewController {
|
||
| 23 | 23 |
// MARK: view function |
| 24 | 24 |
override func viewDidLoad() {
|
| 25 | 25 |
super.viewDidLoad() |
| 26 |
- title = "群成员" |
|
| 26 |
+ navigationItem.title = "群成员" |
|
| 27 | 27 |
binding() |
| 28 | 28 |
} |
| 29 | 29 |
} |
+ 1
- 1
PaiAi/Paiai_iOS/App/Group/GroupDetail/GroupNameModificationViewController.swift
@@ -24,7 +24,7 @@ final class GroupNameModificationViewController: UIViewController {
|
||
| 24 | 24 |
// MARK: view function |
| 25 | 25 |
override func viewDidLoad() {
|
| 26 | 26 |
super.viewDidLoad() |
| 27 |
- title = "群名称" |
|
| 27 |
+ navigationItem.title = "群名称" |
|
| 28 | 28 |
setupTextFieldLeftView() |
| 29 | 29 |
bindTextFieldToSaveButton() |
| 30 | 30 |
} |
+ 10
- 11
PaiAi/Paiai_iOS/App/Group/GroupViewController.swift
@@ -59,8 +59,8 @@ final class GroupViewController: UIViewController {
|
||
| 59 | 59 |
bundle: Bundle(identifier: "com.Paiai-iOS")), |
| 60 | 60 |
forCellWithReuseIdentifier: "photoCell") |
| 61 | 61 |
setup() |
| 62 |
- setNavigationBar() |
|
| 63 | 62 |
binding() |
| 63 |
+ setupNavigationBar() |
|
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 | 66 |
private func setup() {
|
@@ -151,11 +151,7 @@ fileprivate extension GroupViewController {
|
||
| 151 | 151 |
} |
| 152 | 152 |
|
| 153 | 153 |
extension GroupViewController {
|
| 154 |
- var navigationView: UIView {
|
|
| 155 |
- return navigationBarView |
|
| 156 |
- } |
|
| 157 |
- |
|
| 158 |
- func setNavigationBar() {
|
|
| 154 |
+ func setupNavigationBar() {
|
|
| 159 | 155 |
guard navigationViewNotReady else { return }
|
| 160 | 156 |
setRightBarButtonItems() |
| 161 | 157 |
constructNaivgationViewHierarchy() |
@@ -180,7 +176,6 @@ extension GroupViewController {
|
||
| 180 | 176 |
} |
| 181 | 177 |
|
| 182 | 178 |
@objc func presentGroupQR() {
|
| 183 |
- |
|
| 184 | 179 |
let groupItem = viewModel.groupItem.value |
| 185 | 180 |
let alert = AlertViewController(style: .custom(GroupQRView(groupName: groupItem.group_name, |
| 186 | 181 |
groupAvatar: "Group\(groupItem.group_default_avatar)", |
@@ -196,25 +191,29 @@ fileprivate extension GroupViewController {
|
||
| 196 | 191 |
func activateConstraintsNavigation() {
|
| 197 | 192 |
activateConstraintsNavigationBarViewImage() |
| 198 | 193 |
activateConstraintsNavigationBarViewTitle() |
| 194 |
+ |
|
| 195 |
+ if #available(iOS 11, *) { return }
|
|
| 196 |
+ navigationBarViewTitle.sizeToFit() |
|
| 197 |
+ navigationBarView.frame.size = CGSize(width: navigationBarViewTitle.bounds.size.width + 42, height: 36) |
|
| 199 | 198 |
} |
| 200 | 199 |
|
| 201 | 200 |
func activateConstraintsNavigationBarViewTitle() {
|
| 202 | 201 |
navigationBarViewTitle.translatesAutoresizingMaskIntoConstraints = false |
| 203 | 202 |
NSLayoutConstraint.activate([ |
| 204 | 203 |
navigationBarViewTitle.centerYAnchor.constraint(equalTo: navigationBarView.centerYAnchor), |
| 205 |
- navigationBarViewTitle.leadingAnchor.constraint(equalTo: navigationBarViewImage.trailingAnchor, constant: 6), |
|
| 204 |
+ navigationBarViewTitle.widthAnchor.constraint(lessThanOrEqualToConstant: view.width - 200), |
|
| 206 | 205 |
navigationBarViewTitle.trailingAnchor.constraint(equalTo: navigationBarView.trailingAnchor), |
| 207 |
- navigationBarViewTitle.widthAnchor.constraint(lessThanOrEqualToConstant: view.width - 200) |
|
| 206 |
+ navigationBarViewTitle.leadingAnchor.constraint(equalTo: navigationBarViewImage.trailingAnchor, constant: 6) |
|
| 208 | 207 |
]) |
| 209 | 208 |
} |
| 210 | 209 |
|
| 211 | 210 |
func activateConstraintsNavigationBarViewImage() {
|
| 212 | 211 |
navigationBarViewImage.translatesAutoresizingMaskIntoConstraints = false |
| 213 |
- |
|
| 214 | 212 |
NSLayoutConstraint.activate([ |
| 215 | 213 |
navigationBarViewImage.widthAnchor.constraint(equalToConstant: 36), |
| 216 | 214 |
navigationBarViewImage.heightAnchor.constraint(equalToConstant: 36), |
| 217 |
- navigationBarViewImage.centerYAnchor.constraint(equalTo: navigationBarView.centerYAnchor), |
|
| 215 |
+ navigationBarViewImage.topAnchor.constraint(equalTo: navigationBarView.topAnchor), |
|
| 216 |
+ navigationBarViewImage.bottomAnchor.constraint(equalTo: navigationBarView.bottomAnchor), |
|
| 218 | 217 |
navigationBarViewImage.leadingAnchor.constraint(equalTo: navigationBarView.leadingAnchor), |
| 219 | 218 |
]) |
| 220 | 219 |
} |
+ 18
- 20
PaiAi/Paiai_iOS/App/Home/Main.storyboard
@@ -1,11 +1,11 @@ |
||
| 1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2 |
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 2 |
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 3 | 3 |
<device id="retina4_7" orientation="portrait"> |
| 4 | 4 |
<adaptation id="fullscreen"/> |
| 5 | 5 |
</device> |
| 6 | 6 |
<dependencies> |
| 7 | 7 |
<deployment identifier="iOS"/> |
| 8 |
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> |
|
| 8 |
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> |
|
| 9 | 9 |
<capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 10 | 10 |
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| 11 | 11 |
</dependencies> |
@@ -35,17 +35,17 @@ |
||
| 35 | 35 |
<rect key="frame" x="0.0" y="547" width="375" height="120"/> |
| 36 | 36 |
<subviews> |
| 37 | 37 |
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="8lh-CA-1SM"> |
| 38 |
- <rect key="frame" x="37" y="-16" width="126" height="152"/> |
|
| 38 |
+ <rect key="frame" x="79" y="26" width="42" height="68"/> |
|
| 39 | 39 |
<subviews> |
| 40 | 40 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q7U-7O-6Og"> |
| 41 |
- <rect key="frame" x="0.0" y="0.0" width="126" height="126"/> |
|
| 41 |
+ <rect key="frame" x="0.0" y="0.0" width="42" height="42"/> |
|
| 42 | 42 |
<state key="normal" image="BTN-photoAlbum"/> |
| 43 | 43 |
<connections> |
| 44 | 44 |
<action selector="openPhotoLibrary:" destination="xAo-Yl-fd5" eventType="touchUpInside" id="z8x-bJ-FA8"/> |
| 45 | 45 |
</connections> |
| 46 | 46 |
</button> |
| 47 | 47 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="相册" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QXR-Bg-aZe"> |
| 48 |
- <rect key="frame" x="49.5" y="136" width="27" height="16"/> |
|
| 48 |
+ <rect key="frame" x="7.5" y="52" width="27" height="16"/> |
|
| 49 | 49 |
<fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 50 | 50 |
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 51 | 51 |
<nil key="highlightedColor"/> |
@@ -53,10 +53,10 @@ |
||
| 53 | 53 |
</subviews> |
| 54 | 54 |
</stackView> |
| 55 | 55 |
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="AkM-en-2b0"> |
| 56 |
- <rect key="frame" x="212" y="-16" width="126" height="152"/> |
|
| 56 |
+ <rect key="frame" x="254" y="26" width="42" height="68"/> |
|
| 57 | 57 |
<subviews> |
| 58 | 58 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yvI-5s-SNa"> |
| 59 |
- <rect key="frame" x="0.0" y="0.0" width="126" height="126"/> |
|
| 59 |
+ <rect key="frame" x="0.0" y="0.0" width="42" height="42"/> |
|
| 60 | 60 |
<state key="normal" image="BTN-flash"/> |
| 61 | 61 |
<connections> |
| 62 | 62 |
<action selector="chooseFromSYSPhoto" destination="xAo-Yl-fd5" eventType="touchUpInside" id="5MC-Mh-hVr"/> |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 |
</connections> |
| 65 | 65 |
</button> |
| 66 | 66 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="相册" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q3p-9D-GA5" userLabel="开灯"> |
| 67 |
- <rect key="frame" x="49.5" y="136" width="27" height="16"/> |
|
| 67 |
+ <rect key="frame" x="7.5" y="52" width="27" height="16"/> |
|
| 68 | 68 |
<fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 69 | 69 |
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 70 | 70 |
<nil key="highlightedColor"/> |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 |
<constraint firstAttribute="height" constant="64" id="tmA-ui-pTy"/> |
| 130 | 130 |
</constraints> |
| 131 | 131 |
<state key="normal" image="BTN-scanQR"/> |
| 132 |
- <state key="selected" image="BTN-扫码-press"/> |
|
| 132 |
+ <state key="selected" image="BTN-scanQR"/> |
|
| 133 | 133 |
</button> |
| 134 | 134 |
<button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f1p-NO-R2Q"> |
| 135 | 135 |
<rect key="frame" x="0.0" y="67" width="64" height="64"/> |
@@ -138,7 +138,7 @@ |
||
| 138 | 138 |
<constraint firstAttribute="width" constant="64" id="B4F-Wn-0g0"/> |
| 139 | 139 |
</constraints> |
| 140 | 140 |
<state key="normal" image="BTN-add"/> |
| 141 |
- <state key="selected" image="BTN-新增-press"/> |
|
| 141 |
+ <state key="selected" image="BTN-add"/> |
|
| 142 | 142 |
</button> |
| 143 | 143 |
</subviews> |
| 144 | 144 |
</stackView> |
@@ -286,7 +286,7 @@ |
||
| 286 | 286 |
<constraint firstAttribute="height" constant="0.40000000000000002" id="ZwN-I2-gZr"/> |
| 287 | 287 |
</constraints> |
| 288 | 288 |
</view> |
| 289 |
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="默认头像" translatesAutoresizingMaskIntoConstraints="NO" id="75i-bh-kvq"> |
|
| 289 |
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar" translatesAutoresizingMaskIntoConstraints="NO" id="75i-bh-kvq"> |
|
| 290 | 290 |
<rect key="frame" x="111.5" y="57" width="72" height="72"/> |
| 291 | 291 |
<constraints> |
| 292 | 292 |
<constraint firstAttribute="width" secondItem="75i-bh-kvq" secondAttribute="height" multiplier="1:1" id="6j5-1J-zgL"/> |
@@ -490,15 +490,13 @@ |
||
| 490 | 490 |
</scenes> |
| 491 | 491 |
<resources> |
| 492 | 492 |
<image name="BTN-add" width="168" height="168"/> |
| 493 |
- <image name="BTN-flash" width="126" height="126"/> |
|
| 494 |
- <image name="BTN-photoAlbum" width="126" height="126"/> |
|
| 493 |
+ <image name="BTN-flash" width="42" height="42"/> |
|
| 494 |
+ <image name="BTN-photoAlbum" width="42" height="42"/> |
|
| 495 | 495 |
<image name="BTN-scanQR" width="168" height="168"/> |
| 496 |
- <image name="BTN-weixin" width="911" height="247"/> |
|
| 497 |
- <image name="BTN-扫码-press" width="168" height="168"/> |
|
| 498 |
- <image name="BTN-新增-press" width="168" height="168"/> |
|
| 499 |
- <image name="guide1" width="1462" height="2600"/> |
|
| 500 |
- <image name="guide2" width="1462" height="2600"/> |
|
| 501 |
- <image name="guide3" width="1462" height="2600"/> |
|
| 502 |
- <image name="默认头像" width="240" height="240"/> |
|
| 496 |
+ <image name="BTN-weixin" width="1822" height="494"/> |
|
| 497 |
+ <image name="defaultAvatar" width="80" height="80"/> |
|
| 498 |
+ <image name="guide1" width="487.33334350585938" height="866.66668701171875"/> |
|
| 499 |
+ <image name="guide2" width="487.33334350585938" height="866.66668701171875"/> |
|
| 500 |
+ <image name="guide3" width="487.33334350585938" height="866.66668701171875"/> |
|
| 503 | 501 |
</resources> |
| 504 | 502 |
</document> |
+ 1
- 1
PaiAi/Paiai_iOS/App/Home/ScanQRViewController.swift
@@ -29,7 +29,7 @@ final class ScanQRViewController: UIViewController {
|
||
| 29 | 29 |
} |
| 30 | 30 |
|
| 31 | 31 |
func setNavigationBar() {
|
| 32 |
- title = "二维码" |
|
| 32 |
+ navigationItem.title = "二维码" |
|
| 33 | 33 |
navigationController?.navigationBar.setBackgroundImage(UIImage.Navigation.blackBackground, for: .default) |
| 34 | 34 |
} |
| 35 | 35 |
|
+ 12
- 12
PaiAi/Paiai_iOS/App/Message/Message.storyboard
@@ -1,11 +1,11 @@ |
||
| 1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2 |
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 2 |
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
|
| 3 | 3 |
<device id="retina4_7" orientation="portrait"> |
| 4 | 4 |
<adaptation id="fullscreen"/> |
| 5 | 5 |
</device> |
| 6 | 6 |
<dependencies> |
| 7 | 7 |
<deployment identifier="iOS"/> |
| 8 |
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/> |
|
| 8 |
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> |
|
| 9 | 9 |
<capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 10 | 10 |
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
| 11 | 11 |
</dependencies> |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 |
<rect key="frame" x="0.0" y="0.0" width="375" height="103.5"/> |
| 31 | 31 |
<autoresizingMask key="autoresizingMask"/> |
| 32 | 32 |
<subviews> |
| 33 |
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="默认头像" translatesAutoresizingMaskIntoConstraints="NO" id="LCL-dg-vrP"> |
|
| 33 |
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar" translatesAutoresizingMaskIntoConstraints="NO" id="LCL-dg-vrP"> |
|
| 34 | 34 |
<rect key="frame" x="12" y="12" width="48" height="48"/> |
| 35 | 35 |
<constraints> |
| 36 | 36 |
<constraint firstAttribute="width" constant="48" id="PmQ-M2-ztL"/> |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 |
<rect key="frame" x="0.0" y="0.0" width="375" height="83.5"/> |
| 87 | 87 |
<autoresizingMask key="autoresizingMask"/> |
| 88 | 88 |
<subviews> |
| 89 |
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="默认头像" translatesAutoresizingMaskIntoConstraints="NO" id="He8-Ht-nqL"> |
|
| 89 |
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar" translatesAutoresizingMaskIntoConstraints="NO" id="He8-Ht-nqL"> |
|
| 90 | 90 |
<rect key="frame" x="12" y="12" width="48" height="48"/> |
| 91 | 91 |
<constraints> |
| 92 | 92 |
<constraint firstAttribute="width" constant="48" id="pOk-Me-ejm"/> |
@@ -217,10 +217,10 @@ |
||
| 217 | 217 |
<nil key="highlightedColor"/> |
| 218 | 218 |
</label> |
| 219 | 219 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="dyn-zM-jdf"> |
| 220 |
- <rect key="frame" x="341" y="14" width="24" height="36"/> |
|
| 220 |
+ <rect key="frame" x="357" y="26" width="8" height="12"/> |
|
| 221 | 221 |
</imageView> |
| 222 | 222 |
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="veG-mJ-Dsh"> |
| 223 |
- <rect key="frame" x="325" y="28" width="8" height="8"/> |
|
| 223 |
+ <rect key="frame" x="341" y="28" width="8" height="8"/> |
|
| 224 | 224 |
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 225 | 225 |
<constraints> |
| 226 | 226 |
<constraint firstAttribute="height" constant="8" id="OSl-kV-dhl"/> |
@@ -274,10 +274,10 @@ |
||
| 274 | 274 |
<nil key="highlightedColor"/> |
| 275 | 275 |
</label> |
| 276 | 276 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="rWa-ZW-l2r"> |
| 277 |
- <rect key="frame" x="341" y="14" width="24" height="36"/> |
|
| 277 |
+ <rect key="frame" x="357" y="26" width="8" height="12"/> |
|
| 278 | 278 |
</imageView> |
| 279 | 279 |
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iqd-Ji-zvi"> |
| 280 |
- <rect key="frame" x="325" y="28" width="8" height="8"/> |
|
| 280 |
+ <rect key="frame" x="341" y="28" width="8" height="8"/> |
|
| 281 | 281 |
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 282 | 282 |
<constraints> |
| 283 | 283 |
<constraint firstAttribute="height" constant="8" id="MLn-gz-qhL"/> |
@@ -331,10 +331,10 @@ |
||
| 331 | 331 |
<nil key="highlightedColor"/> |
| 332 | 332 |
</label> |
| 333 | 333 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="de8-5g-YER"> |
| 334 |
- <rect key="frame" x="341" y="14" width="24" height="36"/> |
|
| 334 |
+ <rect key="frame" x="357" y="26" width="8" height="12"/> |
|
| 335 | 335 |
</imageView> |
| 336 | 336 |
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ywg-9R-Fz9"> |
| 337 |
- <rect key="frame" x="325" y="28" width="8" height="8"/> |
|
| 337 |
+ <rect key="frame" x="341" y="28" width="8" height="8"/> |
|
| 338 | 338 |
<color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 339 | 339 |
<constraints> |
| 340 | 340 |
<constraint firstAttribute="width" constant="8" id="ZOh-7N-i3b"/> |
@@ -390,10 +390,10 @@ |
||
| 390 | 390 |
</scene> |
| 391 | 391 |
</scenes> |
| 392 | 392 |
<resources> |
| 393 |
- <image name="list-arrow" width="24" height="36"/> |
|
| 393 |
+ <image name="defaultAvatar" width="80" height="80"/> |
|
| 394 |
+ <image name="list-arrow" width="8" height="12"/> |
|
| 394 | 395 |
<image name="message-comment" width="144" height="144"/> |
| 395 | 396 |
<image name="message-system" width="144" height="144"/> |
| 396 | 397 |
<image name="message-thumpub" width="144" height="144"/> |
| 397 |
- <image name="默认头像" width="240" height="240"/> |
|
| 398 | 398 |
</resources> |
| 399 | 399 |
</document> |
+ 4
- 4
PaiAi/Paiai_iOS/App/Message/MessageListViewController.swift
@@ -47,12 +47,12 @@ final class MessageListViewController: UIViewController {
|
||
| 47 | 47 |
view.addSubview(emptyView) |
| 48 | 48 |
setup() |
| 49 | 49 |
binding() |
| 50 |
- setNavigationBar() |
|
| 51 |
- self.viewModel.reload() |
|
| 50 |
+ setupNavigationBar() |
|
| 51 |
+ self.viewModel.reload() |
|
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 |
- private func setNavigationBar() {
|
|
| 55 |
- title = type.model.title |
|
| 54 |
+ private func setupNavigationBar() {
|
|
| 55 |
+ navigationItem.title = type.model.title |
|
| 56 | 56 |
setRightBarButtonItem(image: UIImage.Navigation.right, action: #selector(clearMessage)) |
| 57 | 57 |
} |
| 58 | 58 |
|
+ 42
- 46
PaiAi/Paiai_iOS/App/Mine/Mine.storyboard
@@ -1,10 +1,6 @@ |
||
| 1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
| 2 | 2 |
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES"> |
| 3 |
- <device id="retina4_7" orientation="portrait"> |
|
| 4 |
- <adaptation id="fullscreen"/> |
|
| 5 |
- </device> |
|
| 6 | 3 |
<dependencies> |
| 7 |
- <deployment identifier="iOS"/> |
|
| 8 | 4 |
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> |
| 9 | 5 |
<capability name="Safe area layout guides" minToolsVersion="9.0"/> |
| 10 | 6 |
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> |
@@ -15,19 +11,19 @@ |
||
| 15 | 11 |
<objects> |
| 16 | 12 |
<viewController storyboardIdentifier="MineGroupViewController" automaticallyAdjustsScrollViewInsets="NO" id="o9k-Rd-vOJ" customClass="MineGroupViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 17 | 13 |
<view key="view" contentMode="scaleToFill" id="cAU-qE-GrR"> |
| 18 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 14 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 19 | 15 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 20 | 16 |
<subviews> |
| 21 | 17 |
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="61" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="yW4-I0-rfy"> |
| 22 |
- <rect key="frame" x="0.0" y="20" width="375" height="647"/> |
|
| 18 |
+ <rect key="frame" x="0.0" y="20" width="414" height="876"/> |
|
| 23 | 19 |
<color key="backgroundColor" red="0.90588235289999997" green="0.90588235289999997" blue="0.90588235289999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 24 | 20 |
<color key="separatorColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 25 | 21 |
<prototypes> |
| 26 | 22 |
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="groupCell" rowHeight="60" id="9u5-qP-8Lj" customClass="GroupCell" customModule="Paiai_iOS" customModuleProvider="target"> |
| 27 |
- <rect key="frame" x="0.0" y="28" width="375" height="60"/> |
|
| 23 |
+ <rect key="frame" x="0.0" y="28" width="414" height="60"/> |
|
| 28 | 24 |
<autoresizingMask key="autoresizingMask"/> |
| 29 | 25 |
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9u5-qP-8Lj" id="mxw-Es-Tfw"> |
| 30 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/> |
|
| 26 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="59.5"/> |
|
| 31 | 27 |
<autoresizingMask key="autoresizingMask"/> |
| 32 | 28 |
<subviews> |
| 33 | 29 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="HSy-Af-1be"> |
@@ -43,7 +39,7 @@ |
||
| 43 | 39 |
</userDefinedRuntimeAttributes> |
| 44 | 40 |
</imageView> |
| 45 | 41 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="GAH-5d-ArA"> |
| 46 |
- <rect key="frame" x="355" y="24" width="8" height="12"/> |
|
| 42 |
+ <rect key="frame" x="347" y="22" width="16" height="16"/> |
|
| 47 | 43 |
</imageView> |
| 48 | 44 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="群名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bx9-cB-B0U"> |
| 49 | 45 |
<rect key="frame" x="70" y="6" width="49" height="19.5"/> |
@@ -60,7 +56,7 @@ |
||
| 60 | 56 |
<nil key="highlightedColor"/> |
| 61 | 57 |
</label> |
| 62 | 58 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="有0张照片" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aOD-P8-U4F"> |
| 63 |
- <rect key="frame" x="287" y="22" width="62" height="16"/> |
|
| 59 |
+ <rect key="frame" x="279" y="22" width="62" height="16"/> |
|
| 64 | 60 |
<fontDescription key="fontDescription" type="system" pointSize="13"/> |
| 65 | 61 |
<color key="textColor" red="0.29411764709999999" green="0.29411764709999999" blue="0.29411764709999999" alpha="1" colorSpace="calibratedRGB"/> |
| 66 | 62 |
<nil key="highlightedColor"/> |
@@ -115,14 +111,14 @@ |
||
| 115 | 111 |
<objects> |
| 116 | 112 |
<viewController storyboardIdentifier="MineFeedbackViewController" automaticallyAdjustsScrollViewInsets="NO" id="iwu-HG-AWF" customClass="MineFeedbackViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 117 | 113 |
<view key="view" contentMode="scaleToFill" id="cEP-ra-tcz"> |
| 118 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 114 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 119 | 115 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 120 | 116 |
<subviews> |
| 121 | 117 |
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="hN3-J9-En6"> |
| 122 |
- <rect key="frame" x="0.0" y="20" width="375" height="197"/> |
|
| 118 |
+ <rect key="frame" x="0.0" y="20" width="414" height="197"/> |
|
| 123 | 119 |
<subviews> |
| 124 | 120 |
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="iOy-y4-gly"> |
| 125 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="140"/> |
|
| 121 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="140"/> |
|
| 126 | 122 |
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 127 | 123 |
<constraints> |
| 128 | 124 |
<constraint firstAttribute="height" constant="140" id="rmr-7m-qu4"/> |
@@ -131,7 +127,7 @@ |
||
| 131 | 127 |
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> |
| 132 | 128 |
</textView> |
| 133 | 129 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kyg-hG-JSP"> |
| 134 |
- <rect key="frame" x="0.0" y="152" width="375" height="45"/> |
|
| 130 |
+ <rect key="frame" x="0.0" y="152" width="414" height="45"/> |
|
| 135 | 131 |
<constraints> |
| 136 | 132 |
<constraint firstAttribute="height" constant="45" id="x3X-y4-kmZ"/> |
| 137 | 133 |
</constraints> |
@@ -178,17 +174,17 @@ |
||
| 178 | 174 |
<objects> |
| 179 | 175 |
<viewController storyboardIdentifier="MineAboutViewController" automaticallyAdjustsScrollViewInsets="NO" id="P7c-Sd-BXp" customClass="MineAboutViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 180 | 176 |
<view key="view" contentMode="scaleToFill" id="gzV-sh-iNN"> |
| 181 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 177 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 182 | 178 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 183 | 179 |
<subviews> |
| 184 | 180 |
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="2I3-Nh-YZ5"> |
| 185 |
- <rect key="frame" x="0.0" y="20" width="375" height="641"/> |
|
| 181 |
+ <rect key="frame" x="0.0" y="20" width="414" height="870"/> |
|
| 186 | 182 |
<subviews> |
| 187 | 183 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Str-BX-Lky" userLabel="Logo view"> |
| 188 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="216"/> |
|
| 184 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="216"/> |
|
| 189 | 185 |
<subviews> |
| 190 | 186 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="B7y-Jl-E7G"> |
| 191 |
- <rect key="frame" x="117.5" y="38" width="140" height="140"/> |
|
| 187 |
+ <rect key="frame" x="199" y="100" width="16" height="16"/> |
|
| 192 | 188 |
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 193 | 189 |
</imageView> |
| 194 | 190 |
</subviews> |
@@ -200,23 +196,23 @@ |
||
| 200 | 196 |
</constraints> |
| 201 | 197 |
</view> |
| 202 | 198 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mae-VW-ed0" userLabel="Contact Us View"> |
| 203 |
- <rect key="frame" x="0.0" y="216" width="375" height="48"/> |
|
| 199 |
+ <rect key="frame" x="0.0" y="216" width="414" height="48"/> |
|
| 204 | 200 |
<subviews> |
| 205 | 201 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="about-contactUs" translatesAutoresizingMaskIntoConstraints="NO" id="pVB-Uy-xXH"> |
| 206 |
- <rect key="frame" x="16" y="8" width="32" height="32"/> |
|
| 202 |
+ <rect key="frame" x="16" y="16" width="16" height="16"/> |
|
| 207 | 203 |
</imageView> |
| 208 | 204 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系我们" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CYk-cu-pHl"> |
| 209 |
- <rect key="frame" x="62" y="14.5" width="65.5" height="19.5"/> |
|
| 205 |
+ <rect key="frame" x="46" y="14.5" width="65.5" height="19.5"/> |
|
| 210 | 206 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 211 | 207 |
<fontDescription key="fontDescription" type="system" pointSize="16"/> |
| 212 | 208 |
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 213 | 209 |
<nil key="highlightedColor"/> |
| 214 | 210 |
</label> |
| 215 | 211 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="MgR-ta-3jg"> |
| 216 |
- <rect key="frame" x="357" y="18" width="8" height="12"/> |
|
| 212 |
+ <rect key="frame" x="388" y="16" width="16" height="16"/> |
|
| 217 | 213 |
</imageView> |
| 218 | 214 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L1g-sb-a5F"> |
| 219 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
|
| 215 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="48"/> |
|
| 220 | 216 |
</button> |
| 221 | 217 |
</subviews> |
| 222 | 218 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
@@ -235,23 +231,23 @@ |
||
| 235 | 231 |
</constraints> |
| 236 | 232 |
</view> |
| 237 | 233 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EVY-h5-0pO" userLabel="Score View"> |
| 238 |
- <rect key="frame" x="0.0" y="264" width="375" height="48"/> |
|
| 234 |
+ <rect key="frame" x="0.0" y="264" width="414" height="48"/> |
|
| 239 | 235 |
<subviews> |
| 240 | 236 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="about-score" translatesAutoresizingMaskIntoConstraints="NO" id="0O4-xB-jPJ"> |
| 241 |
- <rect key="frame" x="16" y="8" width="32" height="32"/> |
|
| 237 |
+ <rect key="frame" x="16" y="16" width="16" height="16"/> |
|
| 242 | 238 |
</imageView> |
| 243 | 239 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="给我评分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JAf-2j-KJO"> |
| 244 |
- <rect key="frame" x="62" y="14.5" width="65.5" height="19.5"/> |
|
| 240 |
+ <rect key="frame" x="46" y="14.5" width="65.5" height="19.5"/> |
|
| 245 | 241 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 246 | 242 |
<fontDescription key="fontDescription" type="system" pointSize="16"/> |
| 247 | 243 |
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 248 | 244 |
<nil key="highlightedColor"/> |
| 249 | 245 |
</label> |
| 250 | 246 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="vLw-Zd-Mis"> |
| 251 |
- <rect key="frame" x="357" y="18" width="8" height="12"/> |
|
| 247 |
+ <rect key="frame" x="388" y="16" width="16" height="16"/> |
|
| 252 | 248 |
</imageView> |
| 253 | 249 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FIE-jb-ZGu"> |
| 254 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
|
| 250 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="48"/> |
|
| 255 | 251 |
</button> |
| 256 | 252 |
</subviews> |
| 257 | 253 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
@@ -270,23 +266,23 @@ |
||
| 270 | 266 |
</constraints> |
| 271 | 267 |
</view> |
| 272 | 268 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hN9-6g-QCB" userLabel="User Agreement View"> |
| 273 |
- <rect key="frame" x="0.0" y="312" width="375" height="48"/> |
|
| 269 |
+ <rect key="frame" x="0.0" y="312" width="414" height="48"/> |
|
| 274 | 270 |
<subviews> |
| 275 | 271 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="about-userAgreement" translatesAutoresizingMaskIntoConstraints="NO" id="u6G-8X-fqc"> |
| 276 |
- <rect key="frame" x="16" y="8" width="32" height="32"/> |
|
| 272 |
+ <rect key="frame" x="16" y="16" width="16" height="16"/> |
|
| 277 | 273 |
</imageView> |
| 278 | 274 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户协议" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="COm-64-2lk"> |
| 279 |
- <rect key="frame" x="62" y="14.5" width="65.5" height="19.5"/> |
|
| 275 |
+ <rect key="frame" x="46" y="14.5" width="65.5" height="19.5"/> |
|
| 280 | 276 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 281 | 277 |
<fontDescription key="fontDescription" type="system" pointSize="16"/> |
| 282 | 278 |
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 283 | 279 |
<nil key="highlightedColor"/> |
| 284 | 280 |
</label> |
| 285 | 281 |
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="list-arrow" translatesAutoresizingMaskIntoConstraints="NO" id="mhJ-Uj-tdj"> |
| 286 |
- <rect key="frame" x="357" y="18" width="8" height="12"/> |
|
| 282 |
+ <rect key="frame" x="388" y="16" width="16" height="16"/> |
|
| 287 | 283 |
</imageView> |
| 288 | 284 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VGv-oO-leT"> |
| 289 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="48"/> |
|
| 285 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="48"/> |
|
| 290 | 286 |
</button> |
| 291 | 287 |
</subviews> |
| 292 | 288 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> |
@@ -305,18 +301,18 @@ |
||
| 305 | 301 |
</constraints> |
| 306 | 302 |
</view> |
| 307 | 303 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bjC-jQ-LOw" userLabel="Fill view"> |
| 308 |
- <rect key="frame" x="0.0" y="360" width="375" height="254.5"/> |
|
| 304 |
+ <rect key="frame" x="0.0" y="360" width="414" height="483.5"/> |
|
| 309 | 305 |
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 310 | 306 |
</view> |
| 311 | 307 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="版本：1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bEV-QT-Egq"> |
| 312 |
- <rect key="frame" x="0.0" y="614.5" width="375" height="14.5"/> |
|
| 308 |
+ <rect key="frame" x="0.0" y="843.5" width="414" height="14.5"/> |
|
| 313 | 309 |
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 314 | 310 |
<fontDescription key="fontDescription" type="system" pointSize="12"/> |
| 315 | 311 |
<color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 316 | 312 |
<nil key="highlightedColor"/> |
| 317 | 313 |
</label> |
| 318 | 314 |
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright@pai.ai" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="inH-WZ-fdD"> |
| 319 |
- <rect key="frame" x="0.0" y="629" width="375" height="12"/> |
|
| 315 |
+ <rect key="frame" x="0.0" y="858" width="414" height="12"/> |
|
| 320 | 316 |
<color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 321 | 317 |
<fontDescription key="fontDescription" type="system" pointSize="10"/> |
| 322 | 318 |
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
@@ -351,22 +347,22 @@ |
||
| 351 | 347 |
<objects> |
| 352 | 348 |
<viewController storyboardIdentifier="MineOrderViewController" automaticallyAdjustsScrollViewInsets="NO" id="Rcb-gY-KGS" customClass="MineOrderViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 353 | 349 |
<view key="view" contentMode="scaleToFill" id="1da-az-lxh"> |
| 354 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 350 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 355 | 351 |
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> |
| 356 | 352 |
<subviews> |
| 357 | 353 |
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="64" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Ysr-aa-J9R"> |
| 358 |
- <rect key="frame" x="0.0" y="20" width="375" height="647"/> |
|
| 354 |
+ <rect key="frame" x="0.0" y="20" width="414" height="876"/> |
|
| 359 | 355 |
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 360 | 356 |
<color key="separatorColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> |
| 361 | 357 |
<prototypes> |
| 362 | 358 |
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="orderCell" rowHeight="64" id="b9t-RY-ZJI" customClass="OrderCell" customModule="Paiai_iOS" customModuleProvider="target"> |
| 363 |
- <rect key="frame" x="0.0" y="28" width="375" height="64"/> |
|
| 359 |
+ <rect key="frame" x="0.0" y="28" width="414" height="64"/> |
|
| 364 | 360 |
<autoresizingMask key="autoresizingMask"/> |
| 365 | 361 |
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b9t-RY-ZJI" id="90v-hW-Nj2"> |
| 366 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="63.5"/> |
|
| 362 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="63.5"/> |
|
| 367 | 363 |
<autoresizingMask key="autoresizingMask"/> |
| 368 | 364 |
<subviews> |
| 369 |
- <imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="1001" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="默认头像" translatesAutoresizingMaskIntoConstraints="NO" id="PNO-iQ-jhe"> |
|
| 365 |
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" tag="1001" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultAvatar" translatesAutoresizingMaskIntoConstraints="NO" id="PNO-iQ-jhe"> |
|
| 370 | 366 |
<rect key="frame" x="12" y="8" width="48" height="48"/> |
| 371 | 367 |
<constraints> |
| 372 | 368 |
<constraint firstAttribute="width" secondItem="PNO-iQ-jhe" secondAttribute="height" multiplier="1:1" id="WIg-kG-Lyt"/> |
@@ -459,11 +455,11 @@ |
||
| 459 | 455 |
<objects> |
| 460 | 456 |
<viewController storyboardIdentifier="MineViewController" id="Kfp-Vc-gX5" customClass="MineViewController" customModule="Paiai_iOS" customModuleProvider="target" sceneMemberID="viewController"> |
| 461 | 457 |
<view key="view" contentMode="scaleToFill" id="FlU-Tv-4Jo"> |
| 462 |
- <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> |
|
| 458 |
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/> |
|
| 463 | 459 |
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 464 | 460 |
<subviews> |
| 465 | 461 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jhj-pW-9Bq"> |
| 466 |
- <rect key="frame" x="0.0" y="0.0" width="300" height="667"/> |
|
| 462 |
+ <rect key="frame" x="0.0" y="0.0" width="300" height="896"/> |
|
| 467 | 463 |
<subviews> |
| 468 | 464 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h2e-Sk-rUf"> |
| 469 | 465 |
<rect key="frame" x="0.0" y="0.0" width="300" height="180"/> |
@@ -499,7 +495,7 @@ |
||
| 499 | 495 |
</constraints> |
| 500 | 496 |
</view> |
| 501 | 497 |
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="79F-2W-LpP"> |
| 502 |
- <rect key="frame" x="0.0" y="180" width="300" height="403"/> |
|
| 498 |
+ <rect key="frame" x="0.0" y="180" width="300" height="632"/> |
|
| 503 | 499 |
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 504 | 500 |
<view key="tableFooterView" contentMode="scaleToFill" id="n6f-5A-4wg"> |
| 505 | 501 |
<rect key="frame" x="0.0" y="72" width="300" height="128"/> |
@@ -531,7 +527,7 @@ |
||
| 531 | 527 |
</connections> |
| 532 | 528 |
</tableView> |
| 533 | 529 |
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WmD-RM-Gge"> |
| 534 |
- <rect key="frame" x="0.0" y="583" width="300" height="84"/> |
|
| 530 |
+ <rect key="frame" x="0.0" y="812" width="300" height="84"/> |
|
| 535 | 531 |
<subviews> |
| 536 | 532 |
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uFJ-qP-CrW"> |
| 537 | 533 |
<rect key="frame" x="0.0" y="0.0" width="300" height="84"/> |
@@ -596,9 +592,9 @@ |
||
| 596 | 592 |
<image name="about-contactUs" width="32" height="32"/> |
| 597 | 593 |
<image name="about-score" width="32" height="32"/> |
| 598 | 594 |
<image name="about-userAgreement" width="32" height="32"/> |
| 595 |
+ <image name="defaultAvatar" width="16" height="16"/> |
|
| 599 | 596 |
<image name="list-arrow" width="8" height="12"/> |
| 600 | 597 |
<image name="logo" width="140" height="140"/> |
| 601 | 598 |
<image name="navigation-background" width="6" height="66"/> |
| 602 |
- <image name="默认头像" width="240" height="240"/> |
|
| 603 | 599 |
</resources> |
| 604 | 600 |
</document> |
+ 1
- 1
PaiAi/Paiai_iOS/App/Mine/MineAboutViewController.swift
@@ -27,7 +27,7 @@ final class MineAboutViewController: UIViewController {
|
||
| 27 | 27 |
|
| 28 | 28 |
// scoreLabel.text = UserDefaults.Account.bool(forKey: .isAudit) ? "敬请期待" : "给我评分" |
| 29 | 29 |
// scoreBtn.isEnabled = !(UserDefaults.Account.bool(forKey: .isAudit)) |
| 30 |
- title = "关于" |
|
| 30 |
+ navigationItem.title = "关于" |
|
| 31 | 31 |
versionLabel.text = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String |
| 32 | 32 |
bindGestures() |
| 33 | 33 |
} |
+ 1
- 1
PaiAi/Paiai_iOS/App/Mine/MineFeedbackViewController.swift
@@ -22,7 +22,7 @@ final class MineFeedbackViewController: UIViewController {
|
||
| 22 | 22 |
|
| 23 | 23 |
override func viewDidLoad() {
|
| 24 | 24 |
super.viewDidLoad() |
| 25 |
- title = "意见反馈" |
|
| 25 |
+ navigationItem.title = "意见反馈" |
|
| 26 | 26 |
textView.placeholder = "您的建议是我们前进的动力" |
| 27 | 27 |
textView.textContainerInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10) |
| 28 | 28 |
bindTextViewToSendBtn() |
+ 1
- 1
PaiAi/Paiai_iOS/App/Mine/MineGroupViewController.swift
@@ -32,7 +32,7 @@ final class MineGroupViewController: UIViewController {
|
||
| 32 | 32 |
} |
| 33 | 33 |
|
| 34 | 34 |
private func setNavigationBar() {
|
| 35 |
- title = "我的照片群" |
|
| 35 |
+ navigationItem.title = "我的照片群" |
|
| 36 | 36 |
} |
| 37 | 37 |
|
| 38 | 38 |
private func setup() {
|
+ 1
- 1
PaiAi/Paiai_iOS/App/Mine/MineOrderViewController.swift
@@ -29,7 +29,7 @@ final class MineOrderViewController: UIViewController {
|
||
| 29 | 29 |
} |
| 30 | 30 |
|
| 31 | 31 |
private func setNavigationBar() {
|
| 32 |
- title = "订单记录" |
|
| 32 |
+ navigationItem.title = "订单记录" |
|
| 33 | 33 |
} |
| 34 | 34 |
|
| 35 | 35 |
private func setup() {
|
+ 1
- 1
PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailViewController.swift
@@ -53,7 +53,7 @@ final class PhotoDetailViewController: UIViewController {
|
||
| 53 | 53 |
// MARK: view function |
| 54 | 54 |
override func viewDidLoad() {
|
| 55 | 55 |
super.viewDidLoad() |
| 56 |
- title = "详情" |
|
| 56 |
+ navigationItem.title = "详情" |
|
| 57 | 57 |
binding() |
| 58 | 58 |
setup() |
| 59 | 59 |
} |
+ 1
- 1
PaiAi/Swift-bridge.h
@@ -15,7 +15,7 @@ |
||
| 15 | 15 |
//#import <TencentOpenAPI/QQApiInterface.h> |
| 16 | 16 |
|
| 17 | 17 |
//微信SDK头文件 |
| 18 |
-#import "WXApi.h" |
|
| 18 |
+//#import "WXApi.h" |
|
| 19 | 19 |
|
| 20 | 20 |
//新浪微博SDK头文件 |
| 21 | 21 |
//#import "WeiboSDK.h" |