熊竹 преди 7 години
родител
ревизия
cd32987fd0

BIN
.DS_Store


+ 30 - 0
model.xcodeproj/project.pbxproj

@@ -353,6 +353,12 @@
 		2FA1AF98212ACDEF005F12CA /* AgreementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA1AF94212ACDEE005F12CA /* AgreementViewController.m */; };
 		2FA1AF99212ACDEF005F12CA /* AgreementViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2FA1AF95212ACDEE005F12CA /* AgreementViewController.xib */; };
 		2FA1AF9D212ACDFF005F12CA /* WYWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA1AF9C212ACDFF005F12CA /* WYWebView.m */; };
+		3A44C12A218A0E7A0021DA3F /* MyModelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A44C124218A0E790021DA3F /* MyModelController.m */; };
+		3A44C12B218A0E7A0021DA3F /* MyModelController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A44C125218A0E790021DA3F /* MyModelController.xib */; };
+		3A44C12C218A0E7A0021DA3F /* MyMemberController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A44C126218A0E790021DA3F /* MyMemberController.m */; };
+		3A44C12D218A0E7A0021DA3F /* MyMemberController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A44C127218A0E790021DA3F /* MyMemberController.xib */; };
+		3A44C130218A10770021DA3F /* TabControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A44C12F218A10770021DA3F /* TabControl.m */; };
+		3A44C132218A10800021DA3F /* TabControl.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A44C131218A10800021DA3F /* TabControl.xib */; };
 		3A5EC7472186AF5A00A9438E /* ShadowMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A5EC7452186AF5900A9438E /* ShadowMenu.xib */; };
 		3A5EC7482186AF5A00A9438E /* ShadowMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A5EC7462186AF5A00A9438E /* ShadowMenu.m */; };
 		3A5EC74D2186F56C00A9438E /* MyTeamController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A5EC74B2186F56C00A9438E /* MyTeamController.m */; };
@@ -1109,6 +1115,15 @@
 		2FA1AF96212ACDEF005F12CA /* privateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = privateViewController.h; sourceTree = "<group>"; };
 		2FA1AF9B212ACDFF005F12CA /* WYWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WYWebView.h; sourceTree = "<group>"; };
 		2FA1AF9C212ACDFF005F12CA /* WYWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYWebView.m; sourceTree = "<group>"; };
+		3A44C124218A0E790021DA3F /* MyModelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyModelController.m; sourceTree = "<group>"; };
+		3A44C125218A0E790021DA3F /* MyModelController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyModelController.xib; sourceTree = "<group>"; };
+		3A44C126218A0E790021DA3F /* MyMemberController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyMemberController.m; sourceTree = "<group>"; };
+		3A44C127218A0E790021DA3F /* MyMemberController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyMemberController.xib; sourceTree = "<group>"; };
+		3A44C128218A0E790021DA3F /* MyModelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyModelController.h; sourceTree = "<group>"; };
+		3A44C129218A0E790021DA3F /* MyMemberController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyMemberController.h; sourceTree = "<group>"; };
+		3A44C12E218A10760021DA3F /* TabControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TabControl.h; sourceTree = "<group>"; };
+		3A44C12F218A10770021DA3F /* TabControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TabControl.m; sourceTree = "<group>"; };
+		3A44C131218A10800021DA3F /* TabControl.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TabControl.xib; sourceTree = "<group>"; };
 		3A5EC7442186AF5900A9438E /* ShadowMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowMenu.h; sourceTree = "<group>"; };
 		3A5EC7452186AF5900A9438E /* ShadowMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShadowMenu.xib; sourceTree = "<group>"; };
 		3A5EC7462186AF5A00A9438E /* ShadowMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShadowMenu.m; sourceTree = "<group>"; };
@@ -2414,6 +2429,15 @@
 				3A5EC7592186FBED00A9438E /* MyTeamHeader.h */,
 				3A5EC75A2186FBED00A9438E /* MyTeamHeader.m */,
 				3A5EC7572186F9F200A9438E /* MyTeamHeader.xib */,
+				3A44C129218A0E790021DA3F /* MyMemberController.h */,
+				3A44C126218A0E790021DA3F /* MyMemberController.m */,
+				3A44C127218A0E790021DA3F /* MyMemberController.xib */,
+				3A44C128218A0E790021DA3F /* MyModelController.h */,
+				3A44C124218A0E790021DA3F /* MyModelController.m */,
+				3A44C125218A0E790021DA3F /* MyModelController.xib */,
+				3A44C12E218A10760021DA3F /* TabControl.h */,
+				3A44C12F218A10770021DA3F /* TabControl.m */,
+				3A44C131218A10800021DA3F /* TabControl.xib */,
 			);
 			path = MyTeamVC;
 			sourceTree = "<group>";
@@ -2939,6 +2963,7 @@
 				3AF44FDB21856E1600ABEAEB /* MineNewViewController.xib in Resources */,
 				3AF44FEB21856F0700ABEAEB /* ShadowView.xib in Resources */,
 				2F8D27BA21183DEF00CD7347 /* LICENSE in Resources */,
+				3A44C132218A10800021DA3F /* TabControl.xib in Resources */,
 				3AF44FFE2185AB9F00ABEAEB /* ChooseShareController.xib in Resources */,
 				9EC8711E20FAE7190087746C /* Main.storyboard in Resources */,
 				2FA1AF8021280AE9005F12CA /* video_connect_chat_tip_sender.aac in Resources */,
@@ -2949,6 +2974,7 @@
 				2FA1AF8321280AE9005F12CA /* video_chat_tip_HangUp.aac in Resources */,
 				2F7FC05621242E4700492F0C /* NTESGalleryViewController.xib in Resources */,
 				2F8D26C421183D7300CD7347 /* NIMKitResource.bundle in Resources */,
+				3A44C12D218A0E7A0021DA3F /* MyMemberController.xib in Resources */,
 				3AF44FF421858F3500ABEAEB /* ShareViewController.xib in Resources */,
 				2F168360210B098800941193 /* RegisterViewController.xib in Resources */,
 				2F4A8948211ADB00006D7DD3 /* DetailFourImageCell.xib in Resources */,
@@ -2958,6 +2984,7 @@
 				2F7FC05821242E4700492F0C /* NTESVideoViewController.xib in Resources */,
 				2F7FC08A21242E6300492F0C /* SVProgressHUD.bundle in Resources */,
 				3AF44FEC21856F0700ABEAEB /* MineItemView.xib in Resources */,
+				3A44C12B218A0E7A0021DA3F /* MyModelController.xib in Resources */,
 				2F8D25402114691C00CD7347 /* PGDatePicker.bundle in Resources */,
 				2FA1AF8521280AE9005F12CA /* video_chat_tip_receiver.aac in Resources */,
 				2F8D279721183DB800CD7347 /* README.md in Resources */,
@@ -3028,6 +3055,7 @@
 				2F8D26DB21183D7300CD7347 /* NIMInputMoreContainerView.m in Sources */,
 				2F8D273021183D7400CD7347 /* NSDictionary+NIMKit.m in Sources */,
 				EF812F6B20FEE30E004A6A35 /* ModelNewFeatureController.m in Sources */,
+				3A44C130218A10770021DA3F /* TabControl.m in Sources */,
 				3A5EC7552186F66500A9438E /* MyTeamCell.m in Sources */,
 				2F8D278521183D9000CD7347 /* renderer_yuv420p.c in Sources */,
 				2F8D27BF21183DEF00CD7347 /* NSBundle+TZImagePicker.m in Sources */,
@@ -3070,6 +3098,7 @@
 				2F8D26CF21183D7300CD7347 /* NIMKitAuthorizationTool.m in Sources */,
 				2F8D277A21183D9000CD7347 /* NTESDevice.m in Sources */,
 				2F8D25372114691C00CD7347 /* PGDatePicker+Time.m in Sources */,
+				3A44C12A218A0E7A0021DA3F /* MyModelController.m in Sources */,
 				2F8D271D21183D7400CD7347 /* NIMMessageMaker.m in Sources */,
 				2F8D25342114691C00CD7347 /* PGDatePicker+MonthDayHour.m in Sources */,
 				EF4A658020FDD1CE00FFCD3C /* RedEnvelopeController.m in Sources */,
@@ -3217,6 +3246,7 @@
 				2F8D25432114691C00CD7347 /* PGDatePicker+Common.m in Sources */,
 				2F8D278B21183D9000CD7347 /* yuv420sp.fsh.c in Sources */,
 				2F8D278721183D9000CD7347 /* shader.c in Sources */,
+				3A44C12C218A0E7A0021DA3F /* MyMemberController.m in Sources */,
 				2F8D25362114691C00CD7347 /* NSCalendar+PGCurrent.m in Sources */,
 				3AF450042185BD2E00ABEAEB /* SettingsViewController.m in Sources */,
 				2F8D272521183D7400CD7347 /* NIMSessionNotificationContentView.m in Sources */,

+ 2 - 2
model/Classes/Controllers/Controller/MyTeamVC/MyTeamHeader.m

@@ -43,8 +43,8 @@
     // gradient
     CAGradientLayer *gl = [CAGradientLayer layer];
     gl.frame = self.content.bounds;
-    gl.startPoint = CGPointMake(0.5, 0);
-    gl.endPoint = CGPointMake(0.5, 0.98);
+    gl.startPoint = CGPointMake(0.03, 0.47);
+    gl.endPoint = CGPointMake(0.97, 0.47);
     gl.colors = @[(__bridge id)[UIColor colorWithRed:251/255.0 green:92/255.0 blue:163/255.0 alpha:1].CGColor, (__bridge id)[UIColor colorWithRed:253/255.0 green:127/255.0 blue:141/255.0 alpha:1].CGColor];
     gl.locations = @[@(0), @(1.0f)];
     self.content.layer.cornerRadius = 12;

+ 17 - 0
model/Classes/Controllers/Controller/MyTeamVC/TabControl.h

@@ -0,0 +1,17 @@
+//
+//  TabControl.h
+//  model
+//
+//  Created by Drew on 2018/11/1.
+//  Copyright © 2018年 Mine. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+IB_DESIGNABLE
+@interface TabControl : UIView
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 44 - 0
model/Classes/Controllers/Controller/MyTeamVC/TabControl.m

@@ -0,0 +1,44 @@
+//
+//  TabControl.m
+//  model
+//
+//  Created by Drew on 2018/11/1.
+//  Copyright © 2018年 Mine. All rights reserved.
+//
+
+#import "TabControl.h"
+
+@interface TabControl()
+@property (weak, nonatomic) IBOutlet UIView *indicator;
+@end
+@implementation TabControl
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        [self initView];
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    if (self = [super initWithCoder:aDecoder]) {
+        [self initView];
+    }
+    return self;
+}
+
+- (void) initView {
+    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+    NSString *className = NSStringFromClass([self class]);
+    UIView *view = [[bundle loadNibNamed:className owner:self options:nil] firstObject];
+    view.frame = self.bounds;
+    view.backgroundColor = [UIColor clearColor];
+    [self addSubview:view];
+    self.clipsToBounds = YES;
+}
+
+-(void)layoutSubviews {
+    self.layer.cornerRadius = self.frame.size.height / 2;
+    self.indicator.layer.cornerRadius = self.frame.size.height / 2;
+}
+@end

+ 82 - 0
model/Classes/Controllers/Controller/MyTeamVC/TabControl.xib

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TabControl">
+            <connections>
+                <outlet property="indicator" destination="NbV-UF-lm6" id="vy0-gX-aXa"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="180" height="34"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NbV-UF-lm6">
+                    <rect key="frame" x="0.0" y="0.0" width="90" height="34"/>
+                    <color key="backgroundColor" red="1" green="0.25098039215686274" blue="0.58431372549019611" alpha="1" colorSpace="calibratedRGB"/>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hff-Om-rU2">
+                    <rect key="frame" x="0.0" y="0.0" width="90" height="34"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="模特" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hDU-Rh-m1v">
+                            <rect key="frame" x="28.5" y="7.5" width="33" height="19.5"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="hDU-Rh-m1v" firstAttribute="centerY" secondItem="Hff-Om-rU2" secondAttribute="centerY" id="Pz6-Fd-1Pl"/>
+                        <constraint firstItem="hDU-Rh-m1v" firstAttribute="centerX" secondItem="Hff-Om-rU2" secondAttribute="centerX" id="nVt-Uk-7fO"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6BD-bn-fPa">
+                    <rect key="frame" x="90" y="0.0" width="90" height="34"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cyQ-k9-akf">
+                            <rect key="frame" x="28.5" y="7.5" width="33" height="19.5"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="cyQ-k9-akf" firstAttribute="centerY" secondItem="6BD-bn-fPa" secondAttribute="centerY" id="Osz-fk-KKx"/>
+                        <constraint firstItem="cyQ-k9-akf" firstAttribute="centerX" secondItem="6BD-bn-fPa" secondAttribute="centerX" id="r6a-fr-orD"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="NbV-UF-lm6" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="2LG-q9-x1K"/>
+                <constraint firstItem="6BD-bn-fPa" firstAttribute="leading" secondItem="Hff-Om-rU2" secondAttribute="trailing" id="Ct5-BH-ONn"/>
+                <constraint firstItem="6BD-bn-fPa" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="EML-gs-C7b"/>
+                <constraint firstItem="NbV-UF-lm6" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" multiplier="0.5" id="GgA-iF-BWZ"/>
+                <constraint firstItem="Hff-Om-rU2" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="Pwc-cq-IcM"/>
+                <constraint firstItem="NbV-UF-lm6" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Xyd-Ko-RpT"/>
+                <constraint firstItem="Hff-Om-rU2" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="asn-P9-aYl"/>
+                <constraint firstItem="6BD-bn-fPa" firstAttribute="height" secondItem="Hff-Om-rU2" secondAttribute="height" id="iG2-OH-htR"/>
+                <constraint firstAttribute="bottom" secondItem="NbV-UF-lm6" secondAttribute="bottom" id="jCY-EJ-Bxr"/>
+                <constraint firstItem="6BD-bn-fPa" firstAttribute="width" secondItem="Hff-Om-rU2" secondAttribute="width" id="jZH-M1-3L1"/>
+                <constraint firstItem="6BD-bn-fPa" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="sHb-rh-wNG"/>
+                <constraint firstItem="6BD-bn-fPa" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" id="uEC-hz-yLl"/>
+                <constraint firstItem="Hff-Om-rU2" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" id="v9X-cN-dJW"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <point key="canvasLocation" x="-178.40000000000001" y="116.49175412293854"/>
+        </view>
+    </objects>
+</document>