Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit 4523a57

Browse files
sunnyyoungsunnyyoung
committed
Version 2.2 Pre Release
1 parent c6ede6f commit 4523a57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1356
-1906
lines changed

‎Meizi.xcodeproj/project.pbxproj‎

Lines changed: 556 additions & 1415 deletions
Large diffs are not rendered by default.

‎Meizi/AppDelegate.m‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
1515

1616
//Set Network
1717
[AFNetworkActivityIndicatorManager sharedManager].enabled = YES;
18-
[SYNetworkConfig sharedInstance].baseURL = BaseURL;
1918

2019
//Set SVProgressHUD
21-
[SVProgressHUD setBackgroundColor:[UIColor colorWithWhite:0.0 alpha:0.9]];
22-
[SVProgressHUD setForegroundColor:[UIColor whiteColor]];
20+
[SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
2321

2422
return YES;
2523
}

‎Meizi/Base.lproj/Main.storyboard‎

Lines changed: 43 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="U5B-CM-xhY">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="U5B-CM-xhY">
33
<dependencies>
44
<deployment identifier="iOS"/>
55
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -15,90 +15,60 @@
1515
<autoresizingMask key="autoresizingMask"/>
1616
</navigationBar>
1717
<connections>
18-
<segue destination="TFI-yl-2OI" kind="relationship" relationship="rootViewController" id="eRn-ii-ZrT"/>
18+
<segue destination="t6d-45-wh4" kind="relationship" relationship="rootViewController" id="d5h-c2-8v2"/>
1919
</connections>
2020
</navigationController>
2121
<placeholder placeholderIdentifier="IBFirstResponder" id="dxp-QW-9J9" userLabel="First Responder" sceneMemberID="firstResponder"/>
2222
</objects>
2323
<point key="canvasLocation" x="439" y="1264"/>
2424
</scene>
25-
<!--妹子-->
26-
<scene sceneID="mDm-VO-W8b">
25+
<!--Meizi View Controller-->
26+
<scene sceneID="rrF-fR-yE0">
2727
<objects>
28-
<viewController id="TFI-yl-2OI" customClass="MeiziViewController" sceneMemberID="viewController">
29-
<layoutGuides>
30-
<viewControllerLayoutGuide type="top" id="KcW-bm-hKq"/>
31-
<viewControllerLayoutGuide type="bottom" id="4BY-Zq-Ebl"/>
32-
</layoutGuides>
33-
<view key="view" contentMode="scaleToFill" id="EAJ-Pa-pW1">
28+
<collectionViewController id="t6d-45-wh4" customClass="MeiziViewController" sceneMemberID="viewController">
29+
<collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" id="Ncv-sT-fv8">
3430
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
3531
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
36-
<subviews>
37-
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="NYQ-U1-gBQ">
38-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
39-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
40-
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="1" minimumInteritemSpacing="1" id="wuM-4a-yAD">
41-
<size key="itemSize" width="100" height="100"/>
42-
<size key="headerReferenceSize" width="0.0" height="0.0"/>
43-
<size key="footerReferenceSize" width="0.0" height="0.0"/>
44-
<inset key="sectionInset" minX="1" minY="0.0" maxX="0.0" maxY="0.0"/>
45-
</collectionViewFlowLayout>
46-
<cells>
47-
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MeiziCell" id="Qk5-p0-ixM" customClass="MeiziCell">
48-
<rect key="frame" x="1" y="64" width="100" height="100"/>
49-
<autoresizingMask key="autoresizingMask"/>
50-
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
32+
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
33+
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="1" minimumInteritemSpacing="1" id="FGM-xR-vzn">
34+
<size key="itemSize" width="100" height="100"/>
35+
<size key="headerReferenceSize" width="0.0" height="0.0"/>
36+
<size key="footerReferenceSize" width="0.0" height="0.0"/>
37+
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
38+
</collectionViewFlowLayout>
39+
<cells>
40+
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="MeiziCell" id="m8R-Ec-LuK" customClass="MeiziCell">
41+
<rect key="frame" x="0.0" y="64" width="100" height="100"/>
42+
<autoresizingMask key="autoresizingMask"/>
43+
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
44+
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
45+
<autoresizingMask key="autoresizingMask"/>
46+
<subviews>
47+
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Hvi-5o-yFN">
5148
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
52-
<autoresizingMask key="autoresizingMask"/>
53-
<subviews>
54-
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="JYK-mf-e2r">
55-
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
56-
</imageView>
57-
</subviews>
58-
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
59-
</view>
60-
<constraints>
61-
<constraint firstItem="JYK-mf-e2r" firstAttribute="top" secondItem="Qk5-p0-ixM" secondAttribute="top" id="69a-HY-24d"/>
62-
<constraint firstAttribute="trailing" secondItem="JYK-mf-e2r" secondAttribute="trailing" id="Dt0-xR-FuZ"/>
63-
<constraint firstItem="JYK-mf-e2r" firstAttribute="leading" secondItem="Qk5-p0-ixM" secondAttribute="leading" id="LlF-pU-Mzu"/>
64-
<constraint firstAttribute="bottom" secondItem="JYK-mf-e2r" secondAttribute="bottom" id="jZb-Uh-1Ym"/>
65-
</constraints>
66-
<connections>
67-
<outlet property="imageView" destination="JYK-mf-e2r" id="RsP-zZ-9tW"/>
68-
</connections>
69-
</collectionViewCell>
70-
</cells>
71-
<connections>
72-
<outlet property="dataSource" destination="TFI-yl-2OI" id="Pa3-n3-fzM"/>
73-
<outlet property="delegate" destination="TFI-yl-2OI" id="A8f-Wh-LH7"/>
74-
</connections>
75-
</collectionView>
76-
<view alpha="0.90000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nh1-hs-Bm6" customClass="MeiziCategoryMenuView">
77-
<rect key="frame" x="0.0" y="64" width="600" height="40"/>
78-
<color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
49+
</imageView>
50+
</subviews>
51+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
52+
</view>
7953
<constraints>
80-
<constraint firstAttribute="height" constant="40" id="gg9-fi-Kmh"/>
54+
<constraint firstAttribute="trailing" secondItem="Hvi-5o-yFN" secondAttribute="trailing" id="eWk-51-37P"/>
55+
<constraint firstAttribute="bottom" secondItem="Hvi-5o-yFN" secondAttribute="bottom" id="gwB-6m-1bb"/>
56+
<constraint firstItem="Hvi-5o-yFN" firstAttribute="leading" secondItem="m8R-Ec-LuK" secondAttribute="leading" id="jkt-h6-IGe"/>
57+
<constraint firstItem="Hvi-5o-yFN" firstAttribute="top" secondItem="m8R-Ec-LuK" secondAttribute="top" id="lej-Vv-Wxc"/>
8158
</constraints>
82-
</view>
83-
</subviews>
84-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
85-
<constraints>
86-
<constraint firstItem="NYQ-U1-gBQ" firstAttribute="top" secondItem="EAJ-Pa-pW1" secondAttribute="top" id="6gv-pq-iaw"/>
87-
<constraint firstAttribute="bottom" secondItem="NYQ-U1-gBQ" secondAttribute="bottom" id="9RQ-u3-7s8"/>
88-
<constraint firstItem="nh1-hs-Bm6" firstAttribute="top" secondItem="KcW-bm-hKq" secondAttribute="bottom" id="Grm-70-Ba2"/>
89-
<constraint firstItem="NYQ-U1-gBQ" firstAttribute="leading" secondItem="EAJ-Pa-pW1" secondAttribute="leading" id="Xjp-QJ-hvS"/>
90-
<constraint firstItem="nh1-hs-Bm6" firstAttribute="leading" secondItem="EAJ-Pa-pW1" secondAttribute="leading" id="a9Q-y7-nBy"/>
91-
<constraint firstAttribute="trailing" secondItem="nh1-hs-Bm6" secondAttribute="trailing" id="lai-Jy-Ncj"/>
92-
<constraint firstAttribute="trailing" secondItem="NYQ-U1-gBQ" secondAttribute="trailing" id="uj3-kk-e4u"/>
93-
</constraints>
94-
</view>
95-
<navigationItem key="navigationItem" title="妹子" id="zx7-wY-J7Y"/>
96-
<connections>
97-
<outlet property="cagegoryMenu" destination="nh1-hs-Bm6" id="rvc-gM-1bY"/>
98-
<outlet property="collectionView" destination="NYQ-U1-gBQ" id="I8x-pH-1hq"/>
99-
</connections>
100-
</viewController>
101-
<placeholder placeholderIdentifier="IBFirstResponder" id="e9e-xA-kCM" userLabel="First Responder" sceneMemberID="firstResponder"/>
59+
<connections>
60+
<outlet property="imageView" destination="Hvi-5o-yFN" id="iwW-Et-89m"/>
61+
</connections>
62+
</collectionViewCell>
63+
</cells>
64+
<connections>
65+
<outlet property="dataSource" destination="t6d-45-wh4" id="TaF-gD-y2a"/>
66+
<outlet property="delegate" destination="t6d-45-wh4" id="QMZ-IB-ln2"/>
67+
</connections>
68+
</collectionView>
69+
<navigationItem key="navigationItem" id="xnW-Id-bel"/>
70+
</collectionViewController>
71+
<placeholder placeholderIdentifier="IBFirstResponder" id="rid-cu-B5b" userLabel="First Responder" sceneMemberID="firstResponder"/>
10272
</objects>
10373
<point key="canvasLocation" x="1151" y="1264"/>
10474
</scene>

‎Meizi/Constant.h‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Meizi/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,72 +3,79 @@
33
{
44
"size" : "29x29",
55
"idiom" : "iphone",
6-
"filename" : "Meizi_29pt_@2x.png",
6+
"filename" : "Icon-29.0@2x.png",
77
"scale" : "2x"
88
},
99
{
1010
"size" : "29x29",
1111
"idiom" : "iphone",
12-
"filename" : "Meizi_29pt_@3x.png",
12+
"filename" : "Icon-29.0@3x.png",
1313
"scale" : "3x"
1414
},
1515
{
1616
"size" : "40x40",
1717
"idiom" : "iphone",
18-
"filename" : "Meizi_40pt@2x.png",
18+
"filename" : "Icon-40.0@2x.png",
1919
"scale" : "2x"
2020
},
2121
{
2222
"size" : "40x40",
2323
"idiom" : "iphone",
24-
"filename" : "Meizi_40pt_@3x.png",
24+
"filename" : "Icon-40.0@3x.png",
2525
"scale" : "3x"
2626
},
2727
{
2828
"size" : "60x60",
2929
"idiom" : "iphone",
30-
"filename" : "Meizi_60pt_@2x.png",
30+
"filename" : "Icon-60.0@2x.png",
3131
"scale" : "2x"
3232
},
3333
{
3434
"size" : "60x60",
3535
"idiom" : "iphone",
36-
"filename" : "Meizi_60pt_@3x.png",
36+
"filename" : "Icon-60.0@3x.png",
3737
"scale" : "3x"
3838
},
3939
{
40-
"idiom" : "ipad",
4140
"size" : "29x29",
41+
"idiom" : "ipad",
42+
"filename" : "Icon-29.0@1x.png",
4243
"scale" : "1x"
4344
},
4445
{
45-
"idiom" : "ipad",
4646
"size" : "29x29",
47+
"idiom" : "ipad",
48+
"filename" : "Icon-29.0@2x.png",
4749
"scale" : "2x"
4850
},
4951
{
50-
"idiom" : "ipad",
5152
"size" : "40x40",
53+
"idiom" : "ipad",
54+
"filename" : "Icon-40.0@1x.png",
5255
"scale" : "1x"
5356
},
5457
{
55-
"idiom" : "ipad",
5658
"size" : "40x40",
59+
"idiom" : "ipad",
60+
"filename" : "Icon-40.0@2x.png",
5761
"scale" : "2x"
5862
},
5963
{
60-
"idiom" : "ipad",
6164
"size" : "76x76",
65+
"idiom" : "ipad",
66+
"filename" : "Icon-76.0@1x.png",
6267
"scale" : "1x"
6368
},
6469
{
65-
"idiom" : "ipad",
6670
"size" : "76x76",
71+
"idiom" : "ipad",
72+
"filename" : "Icon-76.0@2x.png",
6773
"scale" : "2x"
6874
},
6975
{
70-
"idiom" : "ipad",
7176
"size" : "83.5x83.5",
77+
"idiom" : "ipad",
78+
"filename" : "Icon-83.5@2x.png",
7279
"scale" : "2x"
7380
}
7481
],

‎Meizi/Images.xcassets/AppIcon.appiconset/Icon-29.0@1x.png‎

1.7 KB
Loading

‎Meizi/Images.xcassets/AppIcon.appiconset/Icon-29.0@2x.png‎

2.58 KB
Loading

‎Meizi/Images.xcassets/AppIcon.appiconset/Icon-29.0@3x.png‎

3.54 KB
Loading

‎Meizi/Images.xcassets/AppIcon.appiconset/Icon-40.0@1x.png‎

2.06 KB
Loading

‎Meizi/Images.xcassets/AppIcon.appiconset/Icon-40.0@2x.png‎

3.35 KB
Loading

0 commit comments

Comments
 (0)