Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

Commit

Permalink
增加追剧栏目
Browse files Browse the repository at this point in the history
  • Loading branch information
iizvv committed Feb 20, 2019
1 parent 68968aa commit a79c491
Show file tree
Hide file tree
Showing 46 changed files with 220 additions and 62 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Design/iMJ UI.sketch
Binary file not shown.
8 changes: 8 additions & 0 deletions iMeiJu_Mac.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
A536D60E221BCAA30035A177 /* IZDetailWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A536D60C221BCAA30035A177 /* IZDetailWindowController.swift */; };
A536D60F221BCAA30035A177 /* IZDetailWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A536D60D221BCAA30035A177 /* IZDetailWindowController.xib */; };
A537C3012217D45F00DE59FC /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = A537C3002217D45F00DE59FC /* dsa_pub.pem */; };
A53F2EAC221D186000065D72 /* IZTracingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53F2EAA221D186000065D72 /* IZTracingViewController.swift */; };
A53F2EAD221D186000065D72 /* IZTracingViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A53F2EAB221D186000065D72 /* IZTracingViewController.xib */; };
DC8CB4A1F6C2CCBB5C4973B1 /* Pods_iMeiJu_Mac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24E8B0BE509C7166EBA48B1E /* Pods_iMeiJu_Mac.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -109,6 +111,8 @@
A536D60C221BCAA30035A177 /* IZDetailWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IZDetailWindowController.swift; sourceTree = "<group>"; };
A536D60D221BCAA30035A177 /* IZDetailWindowController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IZDetailWindowController.xib; sourceTree = "<group>"; };
A537C3002217D45F00DE59FC /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
A53F2EAA221D186000065D72 /* IZTracingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IZTracingViewController.swift; sourceTree = "<group>"; };
A53F2EAB221D186000065D72 /* IZTracingViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = IZTracingViewController.xib; sourceTree = "<group>"; };
BEC8AFFE637A62C7979464AD /* Pods-iMeiJu_Mac.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iMeiJu_Mac.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iMeiJu_Mac/Pods-iMeiJu_Mac.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -207,6 +211,8 @@
2723E377220821E900EB9CE1 /* IZPlotMessageViewController.xib */,
2794040E22127D6A00970316 /* IZCollectionViewController.swift */,
2794040F22127D6A00970316 /* IZCollectionViewController.xib */,
A53F2EAA221D186000065D72 /* IZTracingViewController.swift */,
A53F2EAB221D186000065D72 /* IZTracingViewController.xib */,
27940416221292D000970316 /* IZSettingViewController.swift */,
27940417221292D000970316 /* IZSettingViewController.xib */,
);
Expand Down Expand Up @@ -392,6 +398,7 @@
files = (
2705F0E92205BFB6005A0BB1 /* Assets.xcassets in Resources */,
2794041F2212A86500970316 /* IZMoreWindowController.xib in Resources */,
A53F2EAD221D186000065D72 /* IZTracingViewController.xib in Resources */,
2794041122127D6A00970316 /* IZCollectionViewController.xib in Resources */,
A536D60F221BCAA30035A177 /* IZDetailWindowController.xib in Resources */,
278604AF2209418D0097192A /* IZMoreViewController.xib in Resources */,
Expand Down Expand Up @@ -485,6 +492,7 @@
2705F12F2205C3ED005A0BB1 /* IZExtension.swift in Sources */,
2723E38322085FBF00EB9CE1 /* IZEpisodeItem.swift in Sources */,
2794041B2212A18F00970316 /* IZSearchView.swift in Sources */,
A53F2EAC221D186000065D72 /* IZTracingViewController.swift in Sources */,
278604B92209A27B0097192A /* IZSearchViewController.swift in Sources */,
279403D22211527A00970316 /* IZClipView.swift in Sources */,
278604AE2209418D0097192A /* IZMoreViewController.swift in Sources */,
Expand Down
Binary file added iMeiJu_Mac/Assets.xcassets/.DS_Store
Binary file not shown.
Binary file modified iMeiJu_Mac/Assets.xcassets/movie.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified iMeiJu_Mac/Assets.xcassets/movie.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "search_select@2x.png",
"filename" : "movie_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "search_select@3x.png",
"filename" : "movie_selected@3x.png",
"scale" : "3x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified iMeiJu_Mac/Assets.xcassets/search.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified iMeiJu_Mac/Assets.xcassets/search.imageset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "setting_select@2x.png",
"filename" : "search_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "setting_select@3x.png",
"filename" : "search_selected@3x.png",
"scale" : "3x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "recommend_select@2x.png",
"filename" : "setting_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "recommend_select@3x.png",
"filename" : "setting_selected@3x.png",
"scale" : "3x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
},
{
"idiom" : "universal",
"filename" : "movie_select@2x.png",
"filename" : "tracing@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "movie_select@3x.png",
"filename" : "tracing@3x.png",
"scale" : "3x"
}
],
Expand Down
22 changes: 22 additions & 0 deletions iMeiJu_Mac/Assets.xcassets/tracing_selected.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
58 changes: 38 additions & 20 deletions iMeiJu_Mac/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@
<rect key="frame" x="0.0" y="0.0" width="88" height="682"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zg3-nE-wT6">
<rect key="frame" x="27" y="380" width="34" height="60"/>
<rect key="frame" x="14" y="472" width="60" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="9pf-8f-4F3"/>
<constraint firstAttribute="height" constant="60" id="xka-KO-1kQ"/>
</constraints>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="movie" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="rVm-T3-bKw">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
Expand All @@ -184,9 +184,9 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bDb-Bn-rlQ">
<rect key="frame" x="27" y="280" width="34" height="60"/>
<rect key="frame" x="14" y="392" width="60" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="eo7-NI-ZfL"/>
<constraint firstAttribute="height" constant="60" id="yMc-38-l5f"/>
</constraints>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="television" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="UPT-Wy-iEn">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
Expand All @@ -197,9 +197,9 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="p3t-zW-4uC">
<rect key="frame" x="26" y="180" width="36" height="60"/>
<rect key="frame" x="14" y="312" width="60" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="0Vy-Ml-m4g"/>
<constraint firstAttribute="height" constant="60" id="jVY-SN-6Pr"/>
</constraints>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="search" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="RPJ-Pj-AYP">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
Expand All @@ -220,9 +220,9 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Pwv-xC-U6K" customClass="IZButton" customModule="iMeiJu_Mac" customModuleProvider="target">
<rect key="frame" x="23" y="480" width="42" height="60"/>
<rect key="frame" x="14" y="552" width="60" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="zGy-Fg-D4E"/>
<constraint firstAttribute="height" constant="60" id="8Un-PE-UDK"/>
</constraints>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="recommend" imagePosition="above" alignment="center" imageScaling="proportionallyDown" inset="2" id="MF7-4O-7JH">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
Expand All @@ -232,19 +232,35 @@
<action selector="recommend:" target="XfG-lQ-9wD" id="1fA-xK-kW5"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="J4D-55-xcB">
<rect key="frame" x="14" y="232" width="60" height="60"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="V37-s5-T7Q"/>
<constraint firstAttribute="height" constant="60" id="kSW-DT-XMV"/>
</constraints>
<buttonCell key="cell" type="bevel" bezelStyle="rounded" image="tracing" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="rdg-jL-XtF">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="tracing:" target="XfG-lQ-9wD" id="oHq-n7-8Qn"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="21e-4a-OuC" firstAttribute="top" secondItem="p3t-zW-4uC" secondAttribute="bottom" constant="100" id="42J-Dp-Yxc"/>
<constraint firstItem="bDb-Bn-rlQ" firstAttribute="top" secondItem="zg3-nE-wT6" secondAttribute="bottom" constant="40" id="Alt-AF-JTA"/>
<constraint firstItem="zg3-nE-wT6" firstAttribute="top" secondItem="Pwv-xC-U6K" secondAttribute="bottom" constant="40" id="NnT-9L-qNx"/>
<constraint firstItem="bDb-Bn-rlQ" firstAttribute="top" secondItem="zg3-nE-wT6" secondAttribute="bottom" constant="20" id="17W-38-Vu5"/>
<constraint firstItem="J4D-55-xcB" firstAttribute="top" secondItem="p3t-zW-4uC" secondAttribute="bottom" constant="20" id="LAJ-dI-tch"/>
<constraint firstAttribute="width" constant="88" id="O0I-iY-JIb"/>
<constraint firstItem="zg3-nE-wT6" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="PFb-t9-y7Q"/>
<constraint firstAttribute="bottom" secondItem="21e-4a-OuC" secondAttribute="bottom" constant="20" id="QnK-QP-EGs"/>
<constraint firstItem="p3t-zW-4uC" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="SfV-WJ-U8O"/>
<constraint firstItem="Pwv-xC-U6K" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="X9B-l7-gmr"/>
<constraint firstItem="zg3-nE-wT6" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="a03-Ub-ONJ"/>
<constraint firstItem="bDb-Bn-rlQ" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="jXj-Kf-pCI"/>
<constraint firstItem="p3t-zW-4uC" firstAttribute="top" secondItem="bDb-Bn-rlQ" secondAttribute="bottom" constant="40" id="kzR-a5-wSs"/>
<constraint firstItem="bDb-Bn-rlQ" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="Vv8-UY-hha"/>
<constraint firstItem="p3t-zW-4uC" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="dWW-ss-aBF"/>
<constraint firstItem="Pwv-xC-U6K" firstAttribute="top" secondItem="9uF-Ob-rWU" secondAttribute="top" constant="70" id="h43-SW-WXB"/>
<constraint firstItem="zg3-nE-wT6" firstAttribute="top" secondItem="Pwv-xC-U6K" secondAttribute="bottom" constant="20" id="scL-P2-pPr"/>
<constraint firstItem="J4D-55-xcB" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="uX2-Br-nz4"/>
<constraint firstItem="21e-4a-OuC" firstAttribute="centerX" secondItem="Pwv-xC-U6K" secondAttribute="centerX" id="vxk-C2-zuz"/>
<constraint firstItem="21e-4a-OuC" firstAttribute="centerX" secondItem="9uF-Ob-rWU" secondAttribute="centerX" id="wq4-WT-ZIj"/>
<constraint firstItem="p3t-zW-4uC" firstAttribute="top" secondItem="bDb-Bn-rlQ" secondAttribute="bottom" constant="20" id="y70-PY-lsv"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="3dd-Oy-snq" customClass="IZView" customModule="iMeiJu_Mac" customModuleProvider="target">
Expand All @@ -269,6 +285,7 @@
<outlet property="search" destination="p3t-zW-4uC" id="ywS-3o-zYz"/>
<outlet property="setting" destination="21e-4a-OuC" id="5wt-3c-vKx"/>
<outlet property="television" destination="bDb-Bn-rlQ" id="Jm4-K8-NjS"/>
<outlet property="tracing" destination="J4D-55-xcB" id="52n-Zb-Tmb"/>
</connections>
</viewController>
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
Expand All @@ -277,10 +294,11 @@
</scene>
</scenes>
<resources>
<image name="movie" width="34" height="67"/>
<image name="recommend" width="42" height="68"/>
<image name="search" width="36" height="61"/>
<image name="movie" width="60" height="60"/>
<image name="recommend" width="60" height="60"/>
<image name="search" width="60" height="60"/>
<image name="setting" width="60" height="60"/>
<image name="television" width="34" height="63"/>
<image name="television" width="60" height="60"/>
<image name="tracing" width="60" height="60"/>
</resources>
</document>
Loading

0 comments on commit a79c491

Please sign in to comment.