no message

左丞
1 parent e10ed80e
Showing 2 changed files with 34 additions and 21 deletions Show diff stats
YouerLiveVideo/YouerLiveVideo/Base.lproj/Main.storyboard
YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fhe-aI-EYq">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fhe-aI-EYq">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -882,29 +882,29 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yK0-QJ-bRM">
-                                        <rect key="frame" x="337" y="30" width="30" height="30"/>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow" translatesAutoresizingMaskIntoConstraints="NO" id="KJf-Wq-MZK">
+                                        <rect key="frame" x="350" y="37.5" width="9" height="15"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" secondItem="yK0-QJ-bRM" secondAttribute="height" multiplier="1:1" id="3YU-P4-ctC"/>
-                                            <constraint firstAttribute="height" constant="30" id="HhD-eg-tVW"/>
+                                            <constraint firstAttribute="width" secondItem="KJf-Wq-MZK" secondAttribute="height" multiplier="3:5" id="DmA-cs-Esw"/>
+                                            <constraint firstAttribute="height" constant="15" id="dNM-h3-8ef"/>
                                         </constraints>
-                                        <state key="normal" image="arrow"/>
-                                        <connections>
-                                            <action selector="userEditClcik:" destination="BZx-0y-T5Q" eventType="touchUpInside" id="KOe-u4-Y7x"/>
-                                        </connections>
-                                    </button>
+                                    </imageView>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <gestureRecognizers/>
                                 <constraints>
-                                    <constraint firstItem="yK0-QJ-bRM" firstAttribute="centerY" secondItem="bvl-OP-Mho" secondAttribute="centerY" id="8rD-kC-wG0"/>
+                                    <constraint firstItem="KJf-Wq-MZK" firstAttribute="width" secondItem="KJf-Wq-MZK" secondAttribute="height" multiplier="3:5" id="2Hu-jz-CZx"/>
                                     <constraint firstAttribute="height" constant="90" id="OgG-Ww-2w0"/>
                                     <constraint firstItem="brI-5l-hmz" firstAttribute="centerY" secondItem="bvl-OP-Mho" secondAttribute="centerY" id="YFV-yt-DAA"/>
-                                    <constraint firstAttribute="trailing" secondItem="yK0-QJ-bRM" secondAttribute="trailing" constant="8" id="hGo-7T-muV"/>
+                                    <constraint firstItem="KJf-Wq-MZK" firstAttribute="centerY" secondItem="bvl-OP-Mho" secondAttribute="centerY" id="kP0-NM-qmk"/>
                                     <constraint firstItem="Nqw-kl-w72" firstAttribute="centerY" secondItem="bvl-OP-Mho" secondAttribute="centerY" id="lw6-Jl-KC5"/>
                                     <constraint firstItem="Nqw-kl-w72" firstAttribute="leading" secondItem="brI-5l-hmz" secondAttribute="trailing" constant="16" id="unR-ks-0nT"/>
-                                    <constraint firstItem="yK0-QJ-bRM" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Nqw-kl-w72" secondAttribute="trailing" constant="8" id="vhw-0q-WYU"/>
                                     <constraint firstItem="brI-5l-hmz" firstAttribute="leading" secondItem="bvl-OP-Mho" secondAttribute="leading" constant="16" id="xXW-xf-5Ra"/>
+                                    <constraint firstAttribute="trailing" secondItem="KJf-Wq-MZK" secondAttribute="trailing" constant="16" id="zSb-gj-ga7"/>
                                 </constraints>
+                                <connections>
+                                    <outletCollection property="gestureRecognizers" destination="i8h-9p-4Aq" appends="YES" id="kqd-2i-ljL"/>
+                                </connections>
                             </view>
                         </subviews>
                         <color key="backgroundColor" red="0.89713114500000002" green="0.89431768659999999" blue="0.90413767099999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -926,6 +926,11 @@
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="yJD-YG-4bQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <tapGestureRecognizer id="i8h-9p-4Aq">
+                    <connections>
+                        <action selector="userEditClcik:" destination="BZx-0y-T5Q" id="ezQ-I2-0ca"/>
+                    </connections>
+                </tapGestureRecognizer>
             </objects>
             <point key="canvasLocation" x="1205.5999999999999" y="2112.5937031484259"/>
         </scene>
@@ -19,6 +19,7 @@ class UserViewController: UIViewController {
     var sectionList:[String] = ["历史记录","我的"]
     var isCloseHistoryList:Bool = false
     var isCloseMyResource:Bool = false
+    var user = AppDelegate.instance().accountManager
     override func viewDidLoad() {
         super.viewDidLoad()
         self.configTheme()
@@ -32,8 +33,8 @@ class UserViewController: UIViewController {
     func setUserInfor(){
         userPhoto.layer.cornerRadius = userPhoto.frame.size.height/2
         userPhoto.layer.masksToBounds = true
-        userName.text = AppDelegate.instance().accountManager.name()
-        userPhoto.sd_setImage(with: URL(string: AppDelegate.instance().accountManager.photo()), placeholderImage: #imageLiteral(resourceName: "defphoto.png"))
+        userName.text = user.name()
+        userPhoto.sd_setImage(with: URL(string: user.photo()), placeholderImage: #imageLiteral(resourceName: "defphoto.png"))
     }
@@ -41,11 +42,16 @@ class UserViewController: UIViewController {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
-    
     @IBAction func userEditClcik(_ sender: Any) {
-        let vc = Story.instantiateViewControllerWithIdentifier("UserEditViewControllerVC", storyName: "User") as! UserEditViewController
-        vc.title = "个人信息"
-        self.navigationController?.pushViewController(vc, animated: true)
+        if user.isOnline(){
+            let vc = Story.instantiateViewControllerWithIdentifier("UserEditViewControllerVC", storyName: "User") as! UserEditViewController
+            vc.title = "个人信息"
+            self.navigationController?.pushViewController(vc, animated: true)
+        }else{
+            let vc=Story.instantiateViewControllerWithIdentifier("NewLoginViewControllerVC", storyName: "Login") as! NewLoginViewController
+            self.present(vc, animated: true, completion: nil)
+        }
+
     }
     func editBtnClick(){
@@ -102,7 +108,9 @@ extension UserViewController:UITableViewDelegate,UITableViewDataSource{
     }
     func numberOfSections(in tableView: UITableView) -> Int {
-        
+        if user.roletype() == 3 || user.roletype() == 4 || user.roletype() == 5{
+            return 1
+        }
         return sectionList.count
     }