新生专题

MoblieCQUPT_iOS.xcodeproj/xcshareddata/xcschemes/MoblieCQUPT_iOS.xcscheme

@@ -56,15 +56,16 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "YES"
+      language = "zh-Hans">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference

MoblieCQUPT_iOS/Course/CourseViewController.xib

@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CourseViewController">
@@ -12,9 +16,9 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
-            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </view>
     </objects>
 </document>

MoblieCQUPT_iOS/Finder/Community/CommunityViewController.xib

@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CommunityViewController">
@@ -18,17 +22,16 @@
             <subviews>
                 <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pho-nh-nyw">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </webView>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="pho-nh-nyw" secondAttribute="bottom" id="UBl-Yq-EDH"/>
                 <constraint firstAttribute="trailing" secondItem="pho-nh-nyw" secondAttribute="trailing" id="XtO-Wc-DMR"/>
                 <constraint firstItem="pho-nh-nyw" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="h4m-uO-EIZ"/>
                 <constraint firstItem="pho-nh-nyw" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="urM-3x-i9a"/>
             </constraints>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
             <point key="canvasLocation" x="451.5" y="407.5"/>
         </view>
     </objects>

MoblieCQUPT_iOS/Finder/FinderViewController.m

@@ -6,13 +6,14 @@
 //  Copyright (c) 2015年 Orange-W. All rights reserved.
 //
 
+#import "HomePageViewController.h"
 #import "FinderViewController.h"
 #import "ShopViewController.h"
 #import "WebViewController.h"
 #import "ShakeViewController.h"
 #import "CommunityViewController.h"
 #import "MapViewController.h"
-#import "FreshManMainViewController.h"
+//#import "FreshManMainViewController.h"
 #import "LostViewController.h"
 #import "QuerLoginViewController.h"
 #define kCount 3
@@ -158,10 +159,10 @@ - (void)viewDidLoad {
       forControlEvents:UIControlEventTouchDown];
 
     [_shakeForShopBtn addTarget:self
-                         action:@selector(enterShake)
+                         action:@selector(enterFreshMan)
                forControlEvents:UIControlEventTouchUpInside];
     [_shakeForShopBtn addTarget:self
-                         action:@selector(enterShake)
+                         action:@selector(enterFreshMan)
                forControlEvents:UIControlEventTouchUpOutside];
     [_shakeForShopBtn addTarget:self
                          action:@selector(clickShake)
@@ -245,8 +246,8 @@ - (void)clickMap {
     _mapOfView.backgroundColor = [UIColor colorWithRed:239/255.0 green:239/255.0 blue:239/255.0 alpha:1];
 }
 
-- (void)enterShake{
-    ShakeViewController *svc = [[ShakeViewController alloc] init];
+- (void)enterFreshMan{
+    HomePageViewController *svc = [[HomePageViewController alloc] init];
     svc.hidesBottomBarWhenPushed = YES;
     [self.navigationController pushViewController:svc
                                          animated:YES];

MoblieCQUPT_iOS/Finder/FreshMan_2017/CQUPTBeauty/AppearView.h

@@ -0,0 +1,14 @@
+//
+//  AppearView.h
+//  MoblieCQUPT_iOS
+//
+//  Created by xiaogou134 on 2017/8/8.
+//  Copyright © 2017年 Orange-W. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppearView : UIView
+@property UIImageView *closeImage;
+- (instancetype)initWithFrame:(CGRect )frame WithString:(NSString *) string With:(NSString *) imagee AndContext:(NSString *) context;
+@end

MoblieCQUPT_iOS/Finder/FreshMan_2017/CQUPTBeauty/AppearView.m

@@ -0,0 +1,108 @@
+//
+//  AppearView.m
+//  MoblieCQUPT_iOS
+//
+//  Created by xiaogou134 on 2017/8/8.
+//  Copyright © 2017年 Orange-W. All rights reserved.
+//
+
+#import "AppearView.h"
+#import "PrefixHeader.pch"
+#import "UIImage+Circle.h"
+#import "Masonry.h"
+@interface AppearView()
+@property NSString *string;
+@property UIImage *image;
+@end
+@implementation AppearView
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+- (instancetype)initWithFrame:(CGRect )frame WithString:(NSString *) string With:(NSString *) imagee AndContext:(NSString *) context{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor colorWithRed:189/255.0  green:189/255.0 blue:189/255.0 alpha:0.5];
+        UIView *displayView = [[UIView alloc] init];
+        displayView.center = self.center;
+        displayView.backgroundColor = [UIColor whiteColor];
+        displayView.layer.cornerRadius = 6;
+
+        _closeImage = [[UIImageView alloc] init];
+        _closeImage.image = [UIImage imageNamed:@"close"];
+
+        [displayView addSubview:_closeImage];
+
+        UIImageView *peopleImage = [[UIImageView alloc] init];
+        [peopleImage setContentScaleFactor:[[UIScreen mainScreen] scale]];
+        NSURL *picUrl = [NSURL URLWithString:imagee];
+        NSData *data = [NSData dataWithContentsOfURL:picUrl];
+        UIImage *image = [UIImage imageWithData:data];
+        peopleImage.contentMode = UIViewContentModeScaleAspectFill;
+        peopleImage.layer.cornerRadius = 50* SCREENWIDTH / 375;
+        peopleImage.clipsToBounds = YES;
+        peopleImage.image = image;
+        [displayView addSubview:peopleImage];
+
+        UILabel *nameText = [[UILabel alloc]init];
+        nameText.text = string;
+        nameText.textAlignment = 1;
+        nameText.font = [UIFont systemFontOfSize:17* SCREENWIDTH / 375];
+        nameText.textColor = [UIColor colorWithRed:107/255.0 green:107/255.0 blue:107/255.0 alpha:1];
+        [displayView addSubview:nameText];
+
+        UILabel *StringText = [[UILabel alloc]init];
+        StringText.font = [UIFont systemFontOfSize:13* SCREENWIDTH / 375];
+        StringText.text = context;
+        StringText.numberOfLines = 0;
+        [displayView  addSubview:StringText];
+        StringText.textColor = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1];
+        [self addSubview:displayView];
+
+        [displayView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.mas_equalTo(self);
+            make.centerY.mas_equalTo(self);
+            make.left.mas_equalTo(self.mas_left).offset(59 * SCREENWIDTH / 375);
+            make.right.mas_equalTo(self.mas_right).offset(-59* SCREENWIDTH / 375);
+            make.top.mas_equalTo(self.mas_top).offset(160* SCREENWIDTH / 375);
+            make.bottom.mas_equalTo(self.mas_bottom).offset(-160* SCREENWIDTH / 375);
+        }];
+
+        [_closeImage mas_makeConstraints:^(MASConstraintMaker *make) {
+
+            make.right.mas_equalTo(displayView.mas_right).offset(-10* SCREENWIDTH / 375);
+            make.top.mas_equalTo(displayView.mas_top).offset(10* SCREENWIDTH / 375);
+            make.height.mas_equalTo(@(23* SCREENWIDTH / 375));
+            make.width.mas_equalTo(@(23* SCREENWIDTH / 375));
+        }];
+
+        [peopleImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.mas_equalTo(displayView);
+            make.height.mas_equalTo(@(100* SCREENWIDTH / 375));
+            make.width.mas_equalTo(@(100* SCREENWIDTH / 375));
+            make.top.mas_equalTo(_closeImage.mas_bottom).offset(10* SCREENWIDTH / 375);
+        }];
+
+        [nameText mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(@(20* SCREENWIDTH / 375));
+            make.centerX.mas_equalTo(displayView);
+            make.top.mas_equalTo(peopleImage.mas_bottom).offset(10* SCREENWIDTH / 375);
+        }];
+
+        [StringText mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(@(140* SCREENWIDTH / 375));
+            make.left.mas_equalTo(displayView.mas_left).offset(10* SCREENWIDTH / 375);
+            make.right.mas_equalTo(displayView.mas_right).offset(-10* SCREENWIDTH / 375);
+            make.top.mas_equalTo(nameText.mas_bottom).offset(10* SCREENWIDTH / 375);
+        }];
+
+
+    }
+    return self;
+}
+
+@end

MoblieCQUPT_iOS/Finder/FreshMan_2017/CQUPTBeauty/BigView.h

@@ -0,0 +1,14 @@
+//
+//  BigView.h
+//  MoblieCQUPT_iOS
+//
+//  Created by xiaogou134 on 2017/8/10.
+//  Copyright © 2017年 Orange-W. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface BigView : UIImageView
+@property(strong, nonatomic) UIImageView *imagesView;
+@property(strong, nonatomic) UIScrollView *scrollView;
+@end

MoblieCQUPT_iOS/Finder/FreshMan_2017/CQUPTBeauty/BigView.m

@@ -0,0 +1,66 @@
+//
+//  BigView.m
+//  MoblieCQUPT_iOS
+//
+//  Created by xiaogou134 on 2017/8/10.
+//  Copyright © 2017年 Orange-W. All rights reserved.
+//
+
+#import "BigView.h"
+#import "PrefixHeader.pch"
+@implementation BigView
+
+- (instancetype)initWithFrame:(CGRect)frame{
+    if ([super initWithFrame:frame]) {
+        [self initTap];
+    }
+    return self;
+}
+- (void)initTap{
+    self.userInteractionEnabled = YES;
+
+    UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapBig)];
+
+
+    [self addGestureRecognizer:recognizer];
+}
+-(void)tapBig{
+    [self creactView];
+
+    [UIImageView animateWithDuration:0.2 animations:^{
+        _imagesView.frame = CGRectMake(0, ScreenHeight / 2 - 100, SCREENWIDTH, 200);
+        _imagesView.width = _scrollView.width;
+        _scrollView.backgroundColor = [UIColor whiteColor];
+
+    }];
+}
+-(void)creactView{
+    _scrollView = [[UIScrollView alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    _scrollView.showsHorizontalScrollIndicator = NO;
+    _scrollView.showsVerticalScrollIndicator = NO;
+    [self.window addSubview:_scrollView];
+    CGRect frame = [self convertRect:self.bounds toView:self.window];
+    _imagesView = [[UIImageView alloc] initWithFrame:frame];
+    _imagesView.contentMode = UIViewContentModeScaleAspectFill;
+    _imagesView.image = self.image;
+
+    _imagesView.userInteractionEnabled = YES;
+    //添加手势
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(smallTap)];
+    [_scrollView addGestureRecognizer:tap];
+    [_scrollView addSubview:_imagesView];
+}
+- (void)smallTap{
+
+    [UIView animateWithDuration:.3 animations:^{
+
+        _imagesView.frame = self.frame;
+
+    } completion:^(BOOL finished) {
+        self.hidden = NO;
+        [_scrollView removeFromSuperview];
+
+    }];
+}
+
+@end

MoblieCQUPT_iOS/Finder/FreshMan_2017/CQUPTBeauty/CQUPTBeautyCell.h

@@ -0,0 +1,16 @@
+//
+//  CQUPTBeautyCell.h
+//  MoblieCQUPT_iOS
+//
+//  Created by xiaogou134 on 2017/8/8.
+//  Copyright © 2017年 Orange-W. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "BigView.h"
+@interface CQUPTBeautyCell : UITableViewCell
+@property (strong, nonatomic)UILabel *namesLabel;
+@property(strong, nonatomic) UILabel *contextsLabel;
+@property(strong, nonatomic) BigView *imagesView;
+//-(void)setContextLabelText:(NSString *)text;
+@end